[sdc] update code of sdc

Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a
Signed-off-by: Michael Lando <ml636r@att.com>

14 files changed, 200 insertions, 425 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/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 19dc9b133d..54047d53f1 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
@@ -943,7 +943,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       compute_1c12_scalling_instance_name:
         type: list
         required: true
@@ -957,11 +957,9 @@ node_types:
         entry_schema:
           type: json
       port_1c1_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -985,7 +983,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -1393,7 +1391,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_1c1_t1_port_vlan_requirements:
         type: list
         required: true
@@ -1401,11 +1399,9 @@ node_types:
         entry_schema:
           type: json
       port_1c1_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1441,7 +1437,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -2418,7 +2414,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t1_port_network_role_tag:
         type: list
         required: true
@@ -2454,11 +2450,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_1a_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1a_t1_port_network:
         type: list
         required: true
@@ -2905,13 +2899,11 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t1_port_network_role:
         type: list
         required: true
@@ -2951,11 +2943,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
@@ -2969,17 +2959,15 @@ 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
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
@@ -3420,13 +3408,11 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          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
@@ -3444,11 +3430,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1a_t1_port_network:
         type: list
         required: true
@@ -3470,7 +3454,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1a_t1_port_vlan_requirements:
         type: list
         required: true
@@ -3558,11 +3542,9 @@ node_types:
         entry_schema:
           type: string
       port_1a_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
     attributes:
       a_single_1a_instance_name:
         type: list
@@ -4058,13 +4040,11 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t1_port_network_role:
         type: list
         required: true
@@ -4104,11 +4084,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
@@ -4122,17 +4100,15 @@ 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
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
@@ -4594,7 +4570,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -4636,11 +4612,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       compute_b_single_1b_availability_zone:
         type: list
         required: true
@@ -4672,7 +4646,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_network_role_tag:
         type: list
         required: true
@@ -4692,11 +4666,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1b_t2_port_network:
         type: list
         required: true
@@ -5210,13 +5182,11 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t1_port_network_role:
         type: list
         required: true
@@ -5262,11 +5232,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
@@ -5280,17 +5248,15 @@ 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
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
@@ -5792,13 +5758,11 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1c2_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t1_port_network_role:
         type: list
         required: true
@@ -5838,11 +5802,9 @@ node_types:
         entry_schema:
           type: string
       port_1c2_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
@@ -5856,17 +5818,15 @@ 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
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_1c2_catalog_instance_scheduler_hints:
         type: list
         required: true
@@ -6329,7 +6289,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -6377,11 +6337,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -6401,7 +6359,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_2b_name:
         type: list
         required: true
@@ -6427,11 +6385,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1b_t2_port_network:
         type: list
         required: true
@@ -6894,7 +6850,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -6936,11 +6892,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       compute_b_single_1b_availability_zone:
         type: list
         required: true
@@ -6972,7 +6926,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_1b_t1_port_value_specs:
         type: list
         required: true
@@ -6980,11 +6934,9 @@ 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
         required: true
@@ -6992,11 +6944,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1b_t2_port_network:
         type: list
         required: true
@@ -7476,7 +7426,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_image_name:
         type: string
         required: true
@@ -7524,11 +7474,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t2_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -7548,7 +7496,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_b_single_2b_name:
         type: list
         required: true
@@ -7568,11 +7516,9 @@ 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
         required: true
@@ -7580,11 +7526,9 @@ node_types:
         entry_schema:
           type: string
       port_1b_t1_port_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_1b_t2_port_network:
         type: list
         required: true
@@ -8022,4 +7966,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
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 d61ea01cc8..fa3ffd61dc 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
@@ -297,7 +297,7 @@ topology_template:
             floating_ip_count_required:
               is_required: false
         port_1c2_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
@@ -308,14 +308,13 @@ topology_template:
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - 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:
@@ -355,7 +354,7 @@ topology_template:
             floating_ip_count_required:
               is_required: false
         port_1c2_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
@@ -366,14 +365,13 @@ topology_template:
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - 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:
@@ -413,7 +411,7 @@ topology_template:
             floating_ip_count_required:
               is_required: false
         port_1c2_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
@@ -493,12 +491,11 @@ topology_template:
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             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:
@@ -538,7 +535,7 @@ topology_template:
             floating_ip_count_required:
               is_required: false
         port_1c2_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
@@ -549,12 +546,11 @@ topology_template:
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             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:
@@ -714,14 +710,13 @@ 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:
         - get_input: ppds_net_name
         port_1a_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1a_t1_port_network:
         - a_single_1a_network
@@ -744,7 +739,7 @@ topology_template:
           - a_single_1a_names
           - 0
         port_1a_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         service_template_filter:
           substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
@@ -875,7 +870,7 @@ topology_template:
         compute_b_single_2b_availability_zone:
         - get_input: availabilityzone_name
         port_1b_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_ip_requirements:
         - - ip_version: 4
@@ -893,10 +888,9 @@ 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:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_2
@@ -1026,9 +1020,7 @@ topology_template:
               - myIPs
               - 1
         port_1c1_t1_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
@@ -1165,7 +1157,7 @@ topology_template:
         compute_b_single_2b_availability_zone:
         - get_input: availabilityzone_name
         port_1b_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_ip_requirements:
         - - ip_version: 4
@@ -1180,7 +1172,7 @@ topology_template:
         compute_b_single_2b_user_data_format:
         - RAW
         port_1b_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_2
@@ -1219,11 +1211,11 @@ topology_template:
         - - ip_address:
               get_input:
               - myIPs
-              - 3
+              - 1
         - - ip_address:
               get_input:
               - myIPs
-              - 3
+              - 1
         compute_1c12_scalling_instance_name:
         - get_input:
           - 1c12_scalling_instance_names
@@ -1232,9 +1224,7 @@ topology_template:
           - 1c12_scalling_instance_names
           - 2
         port_1c1_t1_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
@@ -1426,7 +1416,7 @@ topology_template:
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1a_t1_port_network:
         - a_single_1a_network
@@ -1531,7 +1521,7 @@ topology_template:
         compute_b_single_1b_user_data_format:
         - RAW
         port_1b_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         compute_b_single_1b_availability_zone:
         - get_input: availabilityzone_name
@@ -1547,10 +1537,9 @@ 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:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_1
@@ -1586,7 +1575,7 @@ topology_template:
         - ip_address:
             get_input:
             - myIPs
-            - 2
+            - 1
         mac_requirements:
           mac_count_required:
             is_required: false
@@ -1607,7 +1596,7 @@ topology_template:
         - ip_address:
             get_input:
             - myIPs
-            - 2
+            - 1
         mac_requirements:
           mac_count_required:
             is_required: false
@@ -1723,7 +1712,7 @@ topology_template:
         - ip_address:
             get_input:
             - myIPs
-            - 4
+            - 1
         mac_requirements:
           mac_count_required:
             is_required: false
@@ -1744,7 +1733,7 @@ topology_template:
         - ip_address:
             get_input:
             - myIPs
-            - 4
+            - 1
         mac_requirements:
           mac_count_required:
             is_required: false
@@ -1775,7 +1764,7 @@ topology_template:
         compute_b_single_1b_user_data_format:
         - RAW
         port_1b_t2_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         compute_b_single_1b_availability_zone:
         - get_input: availabilityzone_name
@@ -1853,7 +1842,7 @@ topology_template:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
         port_1b_t1_port_mac_requirements:
-        - mac_count_required:
+          mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_1
@@ -2004,4 +1993,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 a249ecf5cc..05bdd392f8 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
@@ -20,17 +20,15 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_1c1_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
     port_1c1_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -60,7 +58,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -135,17 +133,13 @@ topology_template:
           - port_1c1_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c1_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c1_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c1_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c1_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c1_t1_port_mac_requirements
         order:
           get_input:
           - port_1c1_t1_port_order
@@ -159,9 +153,7 @@ topology_template:
           - port_1c1_t1_port_subnetpoolid
           - index_value
         fixed_ips:
-          get_input:
-          - port_1c1_t1_port_fixed_ips
-          - index_value
+          get_input: port_1c1_t1_port_fixed_ips
         name:
           get_input:
           - port_1c1_t1_port_name
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 90c0f22132..451e87cb41 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
@@ -25,7 +25,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     compute_1c12_scalling_instance_name:
       type: list
       required: true
@@ -37,10 +37,8 @@ topology_template:
       entry_schema:
         type: json
     port_1c1_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -60,7 +58,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -112,17 +110,13 @@ topology_template:
           - port_1c1_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c1_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c1_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c1_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c1_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c1_t1_port_mac_requirements
         order:
           get_input:
           - port_1c1_t1_port_order
@@ -136,9 +130,7 @@ topology_template:
           - port_1c1_t1_port_subnetpoolid
           - index_value
         fixed_ips:
-          get_input:
-          - port_1c1_t1_port_fixed_ips
-          - index_value
+          get_input: port_1c1_t1_port_fixed_ips
         name:
           get_input:
           - port_1c1_t1_port_name
@@ -363,4 +355,4 @@ topology_template:
       - dependency
       link_1c12_scalling_instance_1c1_t1_port:
       - 1c12_scalling_instance_1c1_t1_port
-      - link
\ No newline at end of file
+      - link
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 7a439484d6..29c1fd07de 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
@@ -66,12 +66,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1c2_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t1_port_network_role:
       type: list
       required: true
@@ -110,10 +108,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
@@ -125,15 +121,13 @@ 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
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -179,17 +173,13 @@ topology_template:
           - port_1c2_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t2_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c2_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c2_t2_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t2_port_mac_requirements
         order:
           get_input:
           - port_1c2_t2_port_order
@@ -223,17 +213,11 @@ topology_template:
           - port_1c2_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1c2_t1_port_network_role_tag
-          - index_value
+          get_input: port_1c2_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1c2_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t1_port_mac_requirements
         order:
           get_input:
           - port_1c2_t1_port_order
@@ -482,4 +466,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
\ No newline at end of file
+      - link
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 e384bc3dc4..b3db9f4bbe 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
@@ -66,12 +66,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1c2_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t1_port_network_role:
       type: list
       required: true
@@ -105,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
@@ -120,15 +116,13 @@ 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
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -170,17 +164,13 @@ topology_template:
           - port_1c2_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t2_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c2_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c2_t2_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t2_port_mac_requirements
         order:
           get_input:
           - port_1c2_t2_port_order
@@ -214,17 +204,11 @@ topology_template:
           - port_1c2_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1c2_t1_port_network_role_tag
-          - index_value
+          get_input: port_1c2_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1c2_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t1_port_mac_requirements
         order:
           get_input:
           - port_1c2_t1_port_order
@@ -465,4 +449,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
\ No newline at end of file
+      - link
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 1ff0c9b441..399b551a48 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
@@ -66,12 +66,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1c2_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t1_port_network_role:
       type: list
       required: true
@@ -105,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
@@ -120,15 +116,13 @@ 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
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -170,17 +164,13 @@ topology_template:
           - port_1c2_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t2_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c2_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c2_t2_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t2_port_mac_requirements
         order:
           get_input:
           - port_1c2_t2_port_order
@@ -214,17 +204,11 @@ topology_template:
           - port_1c2_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1c2_t1_port_network_role_tag
-          - index_value
+          get_input: port_1c2_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1c2_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t1_port_mac_requirements
         order:
           get_input:
           - port_1c2_t1_port_order
@@ -465,4 +449,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
\ No newline at end of file
+      - link
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 ea49f9743e..d62c28bb12 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
@@ -66,12 +66,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1c2_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t1_port_network_role:
       type: list
       required: true
@@ -105,10 +103,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c2_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
@@ -120,15 +116,13 @@ 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
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -170,17 +164,13 @@ topology_template:
           - port_1c2_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t2_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c2_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c2_t2_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t2_port_mac_requirements
         order:
           get_input:
           - port_1c2_t2_port_order
@@ -214,17 +204,11 @@ topology_template:
           - port_1c2_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c2_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1c2_t1_port_network_role_tag
-          - index_value
+          get_input: port_1c2_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1c2_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c2_t1_port_mac_requirements
         order:
           get_input:
           - port_1c2_t1_port_order
@@ -473,4 +457,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
\ No newline at end of file
+      - link
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 c0ea9ef793..a1ba0b63a9 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
@@ -20,12 +20,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        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
@@ -40,10 +38,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1a_t1_port_network:
       type: list
       required: true
@@ -61,7 +57,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t1_port_vlan_requirements:
       type: list
       required: true
@@ -135,10 +131,8 @@ topology_template:
       entry_schema:
         type: string
     port_1a_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
   node_templates:
     a_single_1a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -152,17 +146,13 @@ topology_template:
           - port_1a_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1a_t1_port_ip_requirements
-          - index_value
+          get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1a_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1a_t1_port_mac_requirements
-          - index_value
+          get_input: port_1a_t1_port_mac_requirements
         order:
           get_input:
           - port_1a_t1_port_order
@@ -223,17 +213,11 @@ topology_template:
           - port_1a_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1a_t2_port_ip_requirements
-          - index_value
+          get_input: port_1a_t2_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1a_t2_port_network_role_tag
-          - index_value
+          get_input: port_1a_t2_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1a_t2_port_mac_requirements
-          - index_value
+          get_input: port_1a_t2_port_mac_requirements
         order:
           get_input:
           - port_1a_t2_port_order
@@ -482,4 +466,4 @@ topology_template:
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
-      - local_storage
\ No newline at end of file
+      - local_storage
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 800932c2ed..3e93b30562 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,7 +32,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1a_t1_port_network_role_tag:
       type: list
       required: true
@@ -62,10 +62,8 @@ topology_template:
       type: string
       required: true
     port_1a_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1a_t1_port_network:
       type: list
       required: true
@@ -134,17 +132,13 @@ topology_template:
           - port_1a_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1a_t1_port_ip_requirements
-          - index_value
+          get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1a_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1a_t1_port_mac_requirements
-          - index_value
+          get_input: port_1a_t1_port_mac_requirements
         order:
           get_input:
           - port_1a_t1_port_order
@@ -346,4 +340,4 @@ topology_template:
       - link
       local_storage_a_single_2a:
       - a_single_2a
-      - local_storage
\ No newline at end of file
+      - local_storage
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 d7831802db..4ec6028a85 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
@@ -33,7 +33,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -68,10 +68,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     compute_b_single_1b_availability_zone:
       type: list
       required: true
@@ -98,27 +96,23 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_value_specs:
       type: list
       required: true
       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
       required: true
       entry_schema:
         type: string
     port_1b_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1b_t2_port_network:
       type: list
       required: true
@@ -179,17 +173,11 @@ topology_template:
           - port_1b_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t1_port_ip_requirements
-          - index_value
+          get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1b_t1_port_network_role_tag
-          - index_value
+          get_input: port_1b_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1b_t1_port_mac_requirements
-          - index_value
+          get_input: port_1b_t1_port_mac_requirements
         order:
           get_input:
           - port_1b_t1_port_order
@@ -223,17 +211,13 @@ topology_template:
           - port_1b_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t2_port_ip_requirements
-          - index_value
+          get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t2_port_mac_requirements
-          - index_value
+          get_input: port_1b_t2_port_mac_requirements
         order:
           get_input:
           - port_1b_t2_port_order
@@ -482,4 +466,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
\ No newline at end of file
+      - dependency
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 b80c2db770..2c022044ae 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
@@ -33,7 +33,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -68,10 +68,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     compute_b_single_1b_availability_zone:
       type: list
       required: true
@@ -98,7 +96,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1b_t1_port_network_role_tag:
       type: list
       required: true
@@ -115,10 +113,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1b_t2_port_network:
       type: list
       required: true
@@ -174,17 +170,13 @@ topology_template:
           - port_1b_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t1_port_ip_requirements
-          - index_value
+          get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t1_port_mac_requirements
-          - index_value
+          get_input: port_1b_t1_port_mac_requirements
         order:
           get_input:
           - port_1b_t1_port_order
@@ -218,17 +210,13 @@ topology_template:
           - port_1b_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t2_port_ip_requirements
-          - index_value
+          get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t2_port_mac_requirements
-          - index_value
+          get_input: port_1b_t2_port_mac_requirements
         order:
           get_input:
           - port_1b_t2_port_order
@@ -477,4 +465,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
\ No newline at end of file
+      - dependency
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 5ce31a4d71..c479dcb2b5 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
@@ -33,7 +33,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -73,10 +73,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -93,7 +91,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_b_single_2b_name:
       type: list
       required: true
@@ -110,20 +108,16 @@ 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
       required: true
       entry_schema:
         type: string
     port_1b_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1b_t2_port_network:
       type: list
       required: true
@@ -179,17 +173,11 @@ topology_template:
           - port_1b_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t1_port_ip_requirements
-          - index_value
+          get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1b_t1_port_network_role_tag
-          - index_value
+          get_input: port_1b_t1_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1b_t1_port_mac_requirements
-          - index_value
+          get_input: port_1b_t1_port_mac_requirements
         order:
           get_input:
           - port_1b_t1_port_order
@@ -223,17 +211,13 @@ topology_template:
           - port_1b_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t2_port_ip_requirements
-          - index_value
+          get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t2_port_mac_requirements
-          - index_value
+          get_input: port_1b_t2_port_mac_requirements
         order:
           get_input:
           - port_1b_t2_port_order
@@ -474,4 +458,4 @@ topology_template:
       - dependency
       dependency_b_single_2b_1b_t1_port:
       - b_single_2b_1b_t1_port
-      - dependency
\ No newline at end of file
+      - dependency
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 a8680d8869..ce479e9984 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
@@ -38,7 +38,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -78,10 +78,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -98,7 +96,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_b_single_2b_name:
       type: list
       required: true
@@ -120,10 +118,8 @@ topology_template:
       entry_schema:
         type: string
     port_1b_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_1b_t2_port_network:
       type: list
       required: true
@@ -174,17 +170,13 @@ topology_template:
           - port_1b_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t1_port_ip_requirements
-          - index_value
+          get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t1_port_mac_requirements
-          - index_value
+          get_input: port_1b_t1_port_mac_requirements
         order:
           get_input:
           - port_1b_t1_port_order
@@ -218,17 +210,13 @@ topology_template:
           - port_1b_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1b_t2_port_ip_requirements
-          - index_value
+          get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1b_t2_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1b_t2_port_mac_requirements
-          - index_value
+          get_input: port_1b_t2_port_mac_requirements
         order:
           get_input:
           - port_1b_t2_port_order
@@ -469,4 +457,4 @@ topology_template:
       - dependency
       dependency_b_single_2b_1b_t1_port:
       - b_single_2b_1b_t1_port
-      - dependency
\ No newline at end of file
+      - dependency