[sdc] - last merges before moving to LF

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

42 files changed, 546 insertions, 1608 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f7162f0255..0c89db4fd9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -927,17 +927,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_pcm_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -955,29 +951,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_pcm_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
@@ -1002,11 +990,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       server_group:
         type: string
         required: true
@@ -1082,11 +1068,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -1526,11 +1510,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
@@ -1606,17 +1588,13 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1c1_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c1_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -1628,11 +1606,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
@@ -1656,29 +1632,21 @@ node_types:
         entry_schema:
           type: json
       port_1c1_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       1c1_scalling_instance_1c1_t1_port_tenant_id:
         type: list
@@ -2125,21 +2093,17 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1a_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_network:
         type: list
         required: true
@@ -2157,11 +2121,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_image_name:
         type: string
         required: true
@@ -2203,23 +2165,17 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2231,17 +2187,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2687,17 +2639,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2717,17 +2665,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -2739,17 +2683,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2793,17 +2733,13 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -3261,11 +3197,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3273,27 +3207,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3309,17 +3237,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3331,11 +3255,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3389,11 +3311,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -3835,11 +3755,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3847,27 +3765,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3883,17 +3795,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3905,11 +3813,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3957,11 +3863,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -4403,17 +4307,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -4433,17 +4333,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -4455,17 +4351,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -4503,11 +4395,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_b_single_1b_metadata:
         type: list
         required: true
@@ -4515,11 +4405,9 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index 92c22476ae..d7fa0cedf3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -166,8 +166,7 @@ topology_template:
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_network_role_tag:
-        - ppds
+        port_1c1_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1c1_t1_port_ip_requirements:
@@ -410,8 +409,7 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -468,8 +466,7 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -662,8 +659,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1a_t2_port_network_role_tag:
-        - ppds
+        port_1a_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t2_port_network:
@@ -901,8 +897,7 @@ topology_template:
         - get_attribute:
           - abstract_a_single_1a
           - a_single_1a_1a_t1_port_tenant_id
-        port_1b_t1_port_network_role_tag:
-        - oam
+        port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -1037,4 +1032,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 5879c89c59..2469e9cb86 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
@@ -91,15 +89,11 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1c1_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c1_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -109,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
@@ -132,25 +124,17 @@ topology_template:
       entry_schema:
         type: json
     port_1c1_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 351bfc739e..f09ccb2ad5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -117,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f80ad..2872bb61d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index d2b08144aa..15e3f83de9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -22,18 +22,14 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1a_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_network:
       type: list
       required: true
@@ -48,10 +44,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_image_name:
       type: string
       required: true
@@ -86,20 +80,14 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1a_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1a_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -109,15 +97,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_1a_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 1e323d88b1..6929834c7e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,20 +82,16 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_b_single_1b_metadata:
       type: list
       required: true
       entry_schema:
         type: json
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 089fcb545a..d71a80ab5c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -99,15 +87,11 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index f96fc7e5b9..0b0de807b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -39,25 +35,17 @@ topology_template:
       type: string
       description: PCRF CM image name
     port_pcm_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_pcm_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     pcm_server_name:
       label: PCRF CM server name
       hidden: false
@@ -83,10 +71,8 @@ topology_template:
       type: string
       description: OAM network name
     port_pcm_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     server_group:
       hidden: false
       immutable: false
@@ -165,10 +151,8 @@ topology_template:
       type: string
       description: CPS network mask
     port_pcm_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cd7dff0688..ed4765e621 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -923,17 +923,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_pcm_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -951,29 +947,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_pcm_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
@@ -998,11 +986,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       server_group:
         type: string
         required: true
@@ -1074,11 +1060,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -1518,11 +1502,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
@@ -1598,17 +1580,13 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1c1_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c1_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -1620,11 +1598,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
@@ -1642,29 +1618,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c1_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       1c1_scalling_instance_instance_name:
         type: list
@@ -2100,21 +2068,17 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1a_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_network:
         type: list
         required: true
@@ -2132,11 +2096,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_image_name:
         type: string
         required: true
@@ -2178,23 +2140,17 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2206,17 +2162,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2662,17 +2614,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2692,17 +2640,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -2714,17 +2658,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2762,17 +2702,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -3230,11 +3166,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3242,27 +3176,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3278,17 +3206,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3300,11 +3224,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3352,11 +3274,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -3798,11 +3718,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3810,27 +3728,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3846,17 +3758,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3868,11 +3776,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3920,11 +3826,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -4453,11 +4357,9 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t2_port_vlan_requirements:
         type: list
         required: true
@@ -4471,11 +4373,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -4485,11 +4385,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -4501,11 +4399,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -4517,17 +4413,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_vlan_requirements:
         type: list
         required: true
@@ -4551,17 +4443,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
     attributes:
       b_single_1b_instance_name:
         type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index f165f9dab4..a3c2dfd6b8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -138,8 +138,7 @@ topology_template:
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_network_role_tag:
-        - ppds
+        port_1c1_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1c1_t1_port_ip_requirements:
@@ -315,8 +314,7 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -377,8 +375,7 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -589,8 +586,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1a_t2_port_network_role_tag:
-        - ppds
+        port_1a_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t2_port_network:
@@ -800,8 +796,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_network_role_tag:
-        - oam
+        port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -943,4 +938,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index fae0d4871a..e318ce1578 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
@@ -91,15 +89,11 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1c1_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c1_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -109,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
@@ -127,25 +119,17 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c1_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index fd0276496e..a658c2b03c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f80ad..2872bb61d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index 595d5d01a0..9730b31935 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -17,18 +17,14 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1a_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_network:
       type: list
       required: true
@@ -43,10 +39,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_image_name:
       type: string
       required: true
@@ -81,20 +75,14 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1a_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1a_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -104,15 +92,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_1a_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 28a98f316f..5c28d30768 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -32,10 +32,8 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t2_port_vlan_requirements:
       type: list
       required: true
@@ -47,10 +45,8 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -58,10 +54,8 @@ topology_template:
       type: string
       required: true
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -71,10 +65,8 @@ topology_template:
       type: string
       required: true
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -84,15 +76,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_vlan_requirements:
       type: list
       required: true
@@ -112,15 +100,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 35b6ab9b4a..85181a63a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,15 +82,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/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/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index 973ca85b4d..6f2b5a7ca4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/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/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -39,25 +35,17 @@ topology_template:
       type: string
       description: PCRF CM image name
     port_pcm_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_pcm_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     pcm_server_name:
       label: PCRF CM server name
       hidden: false
@@ -83,10 +71,8 @@ topology_template:
       type: string
       description: OAM network name
     port_pcm_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     server_group:
       hidden: false
       immutable: false
@@ -161,10 +147,8 @@ topology_template:
       type: string
       description: CPS network mask
     port_pcm_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 958930407c..cb3099c891 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -923,17 +923,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_pcm_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -951,29 +947,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_pcm_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
@@ -998,11 +986,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       server_group:
         type: string
         required: true
@@ -1074,11 +1060,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -1518,11 +1502,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
@@ -1598,17 +1580,13 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1c1_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c1_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -1620,11 +1598,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
@@ -1642,29 +1618,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c1_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       1c1_scalling_instance_instance_name:
         type: list
@@ -2100,21 +2068,17 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1a_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_network:
         type: list
         required: true
@@ -2132,11 +2096,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_image_name:
         type: string
         required: true
@@ -2178,23 +2140,17 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2206,17 +2162,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2662,17 +2614,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -2692,17 +2640,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -2714,17 +2658,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2762,17 +2702,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -3230,11 +3166,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3242,27 +3176,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3278,17 +3206,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3300,11 +3224,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3352,11 +3274,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -3798,11 +3718,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -3810,27 +3728,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3846,17 +3758,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -3868,11 +3776,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3920,11 +3826,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -4390,11 +4294,9 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t2_port_vlan_requirements:
         type: list
         required: true
@@ -4408,11 +4310,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -4422,11 +4322,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -4438,11 +4336,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -4454,17 +4350,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_vlan_requirements:
         type: list
         required: true
@@ -4488,17 +4380,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
     attributes:
       b_single_1b_instance_name:
         type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 2b3b7f6275..286c01ca77 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -134,8 +134,7 @@ topology_template:
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_network_role_tag:
-        - ppds
+        port_1c1_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1c1_t1_port_ip_requirements:
@@ -294,8 +293,7 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -352,8 +350,7 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -510,8 +507,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1a_t2_port_network_role_tag:
-        - ppds
+        port_1a_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t2_port_network:
@@ -713,8 +709,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1b_t1_port_network_role_tag:
-        - oam
+        port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -849,4 +844,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index fae0d4871a..e318ce1578 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
@@ -91,15 +89,11 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1c1_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c1_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -109,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
@@ -127,25 +119,17 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c1_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index fd0276496e..a658c2b03c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f80ad..2872bb61d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index 595d5d01a0..9730b31935 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -17,18 +17,14 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1a_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_network:
       type: list
       required: true
@@ -43,10 +39,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_image_name:
       type: string
       required: true
@@ -81,20 +75,14 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1a_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1a_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -104,15 +92,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_1a_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 28a98f316f..5c28d30768 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -32,10 +32,8 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t2_port_vlan_requirements:
       type: list
       required: true
@@ -47,10 +45,8 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -58,10 +54,8 @@ topology_template:
       type: string
       required: true
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -71,10 +65,8 @@ topology_template:
       type: string
       required: true
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -84,15 +76,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_vlan_requirements:
       type: list
       required: true
@@ -112,15 +100,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 35b6ab9b4a..85181a63a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,15 +82,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 973ca85b4d..6f2b5a7ca4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -39,25 +35,17 @@ topology_template:
       type: string
       description: PCRF CM image name
     port_pcm_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_pcm_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     pcm_server_name:
       label: PCRF CM server name
       hidden: false
@@ -83,10 +71,8 @@ topology_template:
       type: string
       description: OAM network name
     port_pcm_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     server_group:
       hidden: false
       immutable: false
@@ -161,10 +147,8 @@ topology_template:
       type: string
       description: CPS network mask
     port_pcm_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2f8d03a1f8..4dbd5cfbb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -993,23 +993,17 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_1c12_scalling_instance_availability_zone:
         type: list
         required: true
@@ -1023,11 +1017,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       1c12_scalling_instance_1c1_t1_port_tenant_id:
         type: list
@@ -1451,23 +1443,17 @@ node_types:
         entry_schema:
           type: json
       port_1c1_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c1_t1_port_network:
         type: list
         required: true
@@ -1475,11 +1461,9 @@ node_types:
         entry_schema:
           type: string
       port_1c1_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       1c11_scalling_instance_instance_name:
         type: list
@@ -1831,17 +1815,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_pcm_port_0_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -1859,29 +1839,21 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_0_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_pcm_port_0_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_1_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_pcm_port_0_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
@@ -1906,11 +1878,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       server_group:
         type: string
         required: true
@@ -1986,11 +1956,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_pcm_port_1_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -2438,17 +2406,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_a_single_2a_scheduler_hints:
         type: list
         required: true
@@ -2456,11 +2420,9 @@ node_types:
         entry_schema:
           type: json
       port_1a_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_a_single_2a_availability_zone:
         type: list
         required: true
@@ -2482,11 +2444,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_a_single_2a_name:
         type: list
         required: true
@@ -2855,11 +2815,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -2867,27 +2825,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -2903,17 +2855,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -2925,11 +2873,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -2977,11 +2923,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -3430,21 +3374,17 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1a_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_network:
         type: list
         required: true
@@ -3462,11 +3402,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_image_name:
         type: string
         required: true
@@ -3508,23 +3446,17 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_1a_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1a_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -3536,17 +3468,13 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_1a_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1a_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -3992,11 +3920,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -4004,27 +3930,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -4040,17 +3960,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -4062,11 +3978,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -4114,11 +4028,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -4560,17 +4472,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -4590,17 +4498,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -4612,17 +4516,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -4660,11 +4560,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_b_single_1b_metadata:
         type: list
         required: true
@@ -4672,11 +4570,9 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -5128,11 +5024,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -5140,27 +5034,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -5176,17 +5064,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -5198,11 +5082,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -5256,11 +5138,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -5702,11 +5582,9 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1c2_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_1c2_catalog_instance_availability_zone:
         type: list
         required: true
@@ -5714,27 +5592,21 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
       port_1c2_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_vlan_requirements:
         type: list
         required: true
@@ -5750,17 +5622,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1c2_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_ip_requirements:
         type: list
         required: true
@@ -5772,11 +5640,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1c2_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -5824,11 +5690,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1c2_t1_port_ip_requirements:
         type: list
         required: true
@@ -6265,17 +6129,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -6307,33 +6167,25 @@ node_types:
         entry_schema:
           type: json
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -6377,17 +6229,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -6828,17 +6676,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -6858,17 +6702,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       compute_b_single_1b_user_data_format:
         type: list
         required: true
@@ -6880,17 +6720,13 @@ node_types:
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -6934,17 +6770,13 @@ node_types:
         entry_schema:
           type: json
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -7402,17 +7234,13 @@ node_types:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
       port_1b_t1_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t1_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -7438,33 +7266,25 @@ node_types:
         entry_schema:
           type: json
       port_1b_t2_port_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_1b_t2_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       port_1b_t2_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t2_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -7514,17 +7334,13 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_1b_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index 2c5b8abe4c..9407798da3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -354,8 +354,7 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_1
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -412,8 +411,7 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -537,8 +535,7 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -593,8 +590,7 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag:
-        - oam
+        port_1c2_t1_port_network_role_tag: oam
         port_1c2_t1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -754,8 +750,7 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_1a_t2_port_network_role_tag:
-        - ppds
+        port_1a_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t2_port_network:
@@ -933,8 +928,7 @@ topology_template:
           - a_single_1a_1a_t1_port_tenant_id
         compute_b_single_2b_user_data_format:
         - RAW
-        port_1b_t1_port_network_role_tag:
-        - oam
+        port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -1563,8 +1557,7 @@ topology_template:
         - get_attribute:
           - abstract_a_single_1a
           - a_single_1a_1a_t1_port_tenant_id
-        port_1b_t1_port_network_role_tag:
-        - oam
+        port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -2020,4 +2013,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
index 4e16efbe82..4b6aed7260 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
@@ -71,30 +71,22 @@ topology_template:
       entry_schema:
         type: json
     port_1c1_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c1_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     1c11_scalling_instance:
       type: org.openecomp.resource.vfc.nodes.heat.1c11_scalling_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index 195f916993..101a1fdbd6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -66,20 +66,14 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c1_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_1c12_scalling_instance_availability_zone:
       type: list
       required: true
@@ -91,10 +85,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     1c12_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 351bfc739e..f09ccb2ad5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -117,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 767c177abe..ac0d816705 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
index 172cfbb589..576a555e41 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
index dc503608e4..32a9dee48c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
@@ -12,33 +12,25 @@ node_types:
 topology_template:
   inputs:
     port_1c2_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
     port_1c2_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1c2_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_vlan_requirements:
       type: list
       required: true
@@ -51,15 +43,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1c2_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1c2_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_ip_requirements:
       type: list
       required: true
@@ -69,10 +57,8 @@ topology_template:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     port_1c2_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -112,10 +98,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1c2_t1_port_ip_requirements:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
index d2b08144aa..15e3f83de9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
@@ -22,18 +22,14 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
     port_1a_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_network:
       type: list
       required: true
@@ -48,10 +44,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_image_name:
       type: string
       required: true
@@ -86,20 +80,14 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_1a_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1a_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -109,15 +97,11 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_1a_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
index b82ccec156..364ee2a7b5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
@@ -32,25 +32,19 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1a_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_a_single_2a_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
     port_1a_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_a_single_2a_availability_zone:
       type: list
       required: true
@@ -68,10 +62,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_a_single_2a_name:
       type: list
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
index a33804d6bf..3c27b07ed6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -99,15 +87,11 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 32b8575153..d49088c237 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -36,15 +32,11 @@ topology_template:
       type: string
       required: true
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     compute_b_single_1b_user_data_format:
       type: list
       required: true
@@ -54,15 +46,11 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,20 +82,16 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_b_single_1b_metadata:
       type: list
       required: true
       entry_schema:
         type: json
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
index 462ec0395a..c268a091cb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -41,28 +37,20 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -104,15 +92,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index 3d7c15ce93..c894808e8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_1b_t1_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t1_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -46,28 +42,20 @@ topology_template:
       entry_schema:
         type: json
     port_1b_t2_port_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_1b_t2_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_1b_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t2_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -104,15 +92,11 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t1_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_1b_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index f96fc7e5b9..0b0de807b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_pcm_port_0_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -39,25 +35,17 @@ topology_template:
       type: string
       description: PCRF CM image name
     port_pcm_port_0_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_pcm_port_0_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_1_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_pcm_port_0_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     pcm_server_name:
       label: PCRF CM server name
       hidden: false
@@ -83,10 +71,8 @@ topology_template:
       type: string
       description: OAM network name
     port_pcm_port_1_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     server_group:
       hidden: false
       immutable: false
@@ -165,10 +151,8 @@ topology_template:
       type: string
       description: CPS network mask
     port_pcm_port_1_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port