6 files changed, 184 insertions, 164 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 29a1ada429..dd7f089424 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -251,7 +251,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports:
+    - subinterface_link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -374,6 +374,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -528,6 +529,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -762,6 +764,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -793,6 +796,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -872,6 +876,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -944,6 +949,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -1052,7 +1058,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_contrail_vmi_subinterface:
+    - subinterface_link_contrail_vmi_subinterface:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1299,7 +1305,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports:
+    - subinterface_link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1400,6 +1406,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -1500,6 +1507,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -1662,6 +1670,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -1704,6 +1713,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -1756,6 +1766,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -2041,6 +2052,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -2273,7 +2285,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports:
+    - subinterface_link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2394,6 +2406,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -2578,6 +2591,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -2772,6 +2786,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -2791,6 +2806,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -3128,7 +3144,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports:
+    - subinterface_link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3334,6 +3350,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -3580,6 +3597,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -3627,6 +3645,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -3652,6 +3671,7 @@ node_types:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
@@ -3706,4 +3726,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
+\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
index 49a49f526c..9823edae9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_a_childServiceTemplate.yaml
@@ -242,7 +242,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -278,7 +278,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -359,7 +359,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -423,7 +423,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -869,6 +869,9 @@ topology_template:
       dependency_perimeta_ssc_a_untrusted_parent_0_port:
       - perimeta_ssc_a_untrusted_parent_0_port
       - dependency
+      subinterface_link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports:
+      - perimeta_ssc_a_untrusted_0_vlan_ports
+      - subinterface_link_contrail_vmi_subinterface
       link_perimeta_ssc_a_mgmt_1_port:
       - perimeta_ssc_a_mgmt_1_port
       - link
@@ -884,9 +887,6 @@ topology_template:
       dependency_perimeta_ssc_a_ha_0_port:
       - perimeta_ssc_a_ha_0_port
       - dependency
-      link_contrail_vmi_subinterface_perimeta_ssc_a_untrusted_0_vlan_ports:
-      - perimeta_ssc_a_untrusted_0_vlan_ports
-      - link_contrail_vmi_subinterface
       link_perimeta_ssc_a_mgmt_0_port:
       - perimeta_ssc_a_mgmt_0_port
       - link
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
index 406756105c..3a11fe31b3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml
@@ -204,7 +204,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -240,7 +240,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -321,7 +321,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -417,7 +417,7 @@ topology_template:
           ip_count_required:
             is_required: true
           floating_ip_count_required:
-            is_required: true
+            is_required: false
         security_groups:
           get_input: perimeta_sec_groups
         fixed_ips:
@@ -852,6 +852,9 @@ topology_template:
       dependency_perimeta_ssc_b_unused_0_port:
       - perimeta_ssc_b_unused_0_port
       - dependency
+      subinterface_link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports:
+      - perimeta_ssc_b_untrusted_0_vlan_ports
+      - subinterface_link_contrail_vmi_subinterface
       dependency_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports:
       - perimeta_ssc_b_untrusted_0_vlan_ports
       - dependency_contrail_vmi_subinterface
@@ -861,9 +864,6 @@ topology_template:
       local_storage_perimeta_ssc_b_server_0:
       - perimeta_ssc_b_server_0
       - local_storage
-      link_contrail_vmi_subinterface_perimeta_ssc_b_untrusted_0_vlan_ports:
-      - perimeta_ssc_b_untrusted_0_vlan_ports
-      - link_contrail_vmi_subinterface
       link_perimeta_ssc_b_mgmt_0_port:
       - perimeta_ssc_b_mgmt_0_port
       - link
@@ -893,4 +893,4 @@ topology_template:
       - dependency
       link_perimeta_ssc_b_ha_0_port:
       - perimeta_ssc_b_ha_0_port
-      - link
+      - link
+\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
index 8d11d9b6e4..c2b4697234 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_a_childServiceTemplate.yaml
@@ -795,9 +795,6 @@ topology_template:
       dependency_perimeta_rtp_msc_a_ha_0_port:
       - perimeta_rtp_msc_a_ha_0_port
       - dependency
-      link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports:
-      - perimeta_rtp_msc_a_untrusted_0_vlan_ports
-      - link_contrail_vmi_subinterface
       link_perimeta_rtp_msc_a_untrusted_parent_0_port:
       - perimeta_rtp_msc_a_untrusted_parent_0_port
       - link
@@ -807,6 +804,9 @@ topology_template:
       dependency_perimeta_rtp_msc_a_server_0:
       - perimeta_rtp_msc_a_server_0
       - dependency
+      subinterface_link_contrail_vmi_subinterface_perimeta_rtp_msc_a_untrusted_0_vlan_ports:
+      - perimeta_rtp_msc_a_untrusted_0_vlan_ports
+      - subinterface_link_contrail_vmi_subinterface
       dependency_perimeta_rtp_msc_a_trusted_0_port:
       - perimeta_rtp_msc_a_trusted_0_port
       - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
index f71b4500fa..449677d8da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_2_perimeta_sw_b_childServiceTemplate.yaml
@@ -781,15 +781,15 @@ topology_template:
       dependency_perimeta_rtp_msc_b_mgmt_0_port:
       - perimeta_rtp_msc_b_mgmt_0_port
       - dependency
-      link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports:
-      - perimeta_rtp_msc_b_untrusted_0_vlan_ports
-      - link_contrail_vmi_subinterface
       link_perimeta_rtp_msc_b_trusted_0_port:
       - perimeta_rtp_msc_b_trusted_0_port
       - link
       dependency_perimeta_rtp_msc_b_untrusted_parent_0_port:
       - perimeta_rtp_msc_b_untrusted_parent_0_port
       - dependency
+      subinterface_link_contrail_vmi_subinterface_perimeta_rtp_msc_b_untrusted_0_vlan_ports:
+      - perimeta_rtp_msc_b_untrusted_0_vlan_ports
+      - subinterface_link_contrail_vmi_subinterface
       link_perimeta_rtp_msc_b_ha_0_port:
       - perimeta_rtp_msc_b_ha_0_port
       - link
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml
index 12a1064c31..7c222cceb0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/vlan_subinterface_dualServiceTemplate.yaml
@@ -1,137 +1,137 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
-  template_name: vlan_subinterface_dual
-imports:
-- openecomp_heat_index:
-    file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
-    file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
-  inputs:
-    perimeta_parent_interface:
-      hidden: false
-      immutable: false
-      type: string
-      description: Parent Contrail interface
-    perimeta_v6_vip_0:
-      hidden: false
-      immutable: false
-      type: string
-      description: virtual IPv6 address associated with subinterfaces
-    perimeta_subinterface_name_prefix:
-      hidden: false
-      immutable: false
-      type: string
-      description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
-    perimeta_vlan_networks:
-      hidden: false
-      immutable: false
-      type: list
-      description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
-      entry_schema:
-        type: string
-    perimeta_subinterface_instance_index:
-      hidden: false
-      immutable: false
-      type: float
-      description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
-      constraints:
-      - in_range:
-        - 1
-        - 1001
-    perimeta_ip_0:
-      hidden: false
-      immutable: false
-      type: string
-      description: IPv4 address associated with subinterfaces
-    perimeta_vip_0:
-      hidden: false
-      immutable: false
-      type: string
-      description: virtual IPv4 address associated with subinterfaces
-    perimeta_vlan_ids:
-      hidden: false
-      immutable: false
-      type: list
-      description: List of VLAN IDs to use for subinterfaces
-      entry_schema:
-        type: string
-    perimeta_mac_address:
-      hidden: false
-      immutable: false
-      type: string
-      description: MAC address to use for subinterface
-    perimeta_v6_ip_0:
-      hidden: false
-      immutable: false
-      type: string
-      description: IPv6 address associated with subinterfaces
-  node_templates:
-    contrail_vmi_subinterface:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-      properties:
-        virtual_machine_interface_refs:
-        - get_input: perimeta_parent_interface
-        name:
-          str_replace:
-            template: $NAME_$VLAN
-            params:
-              $NAME:
-                get_input: perimeta_subinterface_name_prefix
-              $VLAN:
-                get_input:
-                - perimeta_vlan_ids
-                - get_input: perimeta_subinterface_instance_index
-        virtual_network_refs:
-        - get_input:
-          - perimeta_vlan_networks
-          - get_input: perimeta_subinterface_instance_index
-        virtual_machine_interface_properties:
-          sub_interface_vlan_tag:
-            get_input:
-            - perimeta_vlan_ids
-            - get_input: perimeta_subinterface_instance_index
-        virtual_machine_interface_allowed_address_pairs:
-          allowed_address_pair:
-          - address_mode: active-standby
-            ip:
-              ip_prefix:
-                get_input: perimeta_vip_0
-              ip_prefix_len: 32
-            mac:
-              get_input: perimeta_mac_address
-          - address_mode: active-standby
-            ip:
-              ip_prefix:
-                get_input: perimeta_v6_vip_0
-              ip_prefix_len: 128
-            mac:
-              get_input: perimeta_mac_address
-        virtual_machine_interface_mac_addresses:
-          mac_address:
-          - get_input: perimeta_mac_address
-  groups:
-    vlan_subinterface_dual_group:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/vlan_subinterface_dual.yaml
-        description: |
-          HOT template to instantiate a single Contrail VLAN sub-interface with associated instance IP addresses and allowed address pairs
-      members:
-      - contrail_vmi_subinterface
-  substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan_subinterface_dual
-    capabilities:
-      feature_contrail_vmi_subinterface:
-      - contrail_vmi_subinterface
-      - feature
-    requirements:
-      binding_contrail_vmi_subinterface:
-      - contrail_vmi_subinterface
-      - binding
-      link_contrail_vmi_subinterface:
-      - contrail_vmi_subinterface
-      - link
-      dependency_contrail_vmi_subinterface:
-      - contrail_vmi_subinterface
-      - dependency
-\ No newline at end of file
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: vlan_subinterface_dual
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    perimeta_parent_interface:
+      hidden: false
+      immutable: false
+      type: string
+      description: Parent Contrail interface
+    perimeta_v6_vip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: virtual IPv6 address associated with subinterfaces
+    perimeta_subinterface_name_prefix:
+      hidden: false
+      immutable: false
+      type: string
+      description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
+    perimeta_vlan_networks:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list
+      entry_schema:
+        type: string
+    perimeta_subinterface_instance_index:
+      hidden: false
+      immutable: false
+      type: float
+      description: Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances.
+      constraints:
+      - in_range:
+        - 1
+        - 1001
+    perimeta_ip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: IPv4 address associated with subinterfaces
+    perimeta_vip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: virtual IPv4 address associated with subinterfaces
+    perimeta_vlan_ids:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of VLAN IDs to use for subinterfaces
+      entry_schema:
+        type: string
+    perimeta_mac_address:
+      hidden: false
+      immutable: false
+      type: string
+      description: MAC address to use for subinterface
+    perimeta_v6_ip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: IPv6 address associated with subinterfaces
+  node_templates:
+    contrail_vmi_subinterface:
+      type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
+      properties:
+        virtual_machine_interface_refs:
+        - get_input: perimeta_parent_interface
+        name:
+          str_replace:
+            template: $NAME_$VLAN
+            params:
+              $NAME:
+                get_input: perimeta_subinterface_name_prefix
+              $VLAN:
+                get_input:
+                - perimeta_vlan_ids
+                - get_input: perimeta_subinterface_instance_index
+        virtual_network_refs:
+        - get_input:
+          - perimeta_vlan_networks
+          - get_input: perimeta_subinterface_instance_index
+        virtual_machine_interface_properties:
+          sub_interface_vlan_tag:
+            get_input:
+            - perimeta_vlan_ids
+            - get_input: perimeta_subinterface_instance_index
+        virtual_machine_interface_allowed_address_pairs:
+          allowed_address_pair:
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: perimeta_vip_0
+              ip_prefix_len: 32
+            mac:
+              get_input: perimeta_mac_address
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: perimeta_v6_vip_0
+              ip_prefix_len: 128
+            mac:
+              get_input: perimeta_mac_address
+        virtual_machine_interface_mac_addresses:
+          mac_address:
+          - get_input: perimeta_mac_address
+  groups:
+    vlan_subinterface_dual_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/vlan_subinterface_dual.yaml
+        description: |
+          HOT template to instantiate a single Contrail VLAN sub-interface with associated instance IP addresses and allowed address pairs
+      members:
+      - contrail_vmi_subinterface
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan_subinterface_dual
+    capabilities:
+      feature_contrail_vmi_subinterface:
+      - contrail_vmi_subinterface
+      - feature
+    requirements:
+      binding_contrail_vmi_subinterface:
+      - contrail_vmi_subinterface
+      - binding
+      subinterface_link_contrail_vmi_subinterface:
+      - contrail_vmi_subinterface
+      - subinterface_link
+      dependency_contrail_vmi_subinterface:
+      - contrail_vmi_subinterface
+      - dependency
+\ No newline at end of file