Port scaling not working properly

Made changes in evaluating port naming pattern.

Change-Id: If9a3fc9c3d50fa5c4da319d2ff7d5f8ce6ca8ffe
Issue-ID: SDC-573
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

6 files changed, 2100 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/MANIFEST.json
new file mode 100644
index 0000000000..f7d6298dc4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/MANIFEST.json
@@ -0,0 +1,32 @@
+{
+  "name": "test_import_1510",
+  "description": "string",
+  "version": "8.1",
+  "data": [
+    {
+      "isBase": true,
+      "file": "base_vIECCF.yml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "base_vIECCF.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "base_vIECCF_volume.yml",
+          "type": "HEAT_VOL",
+          "data": [
+            {
+              "file": "base_vIECCF_volume.env",
+              "type": "HEAT_ENV"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "file": "node_userdata_script.sh",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.env
new file mode 100644
index 0000000000..522ccca14d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.env
@@ -0,0 +1,140 @@
+## Note: Nokia VM ENV file for vCCF
+## Copyright: Nokia 2016
+## Name: "base_vIECCF.env"
+## Date: 20 Dec 2016
+## Juno Version
+## Version History
+##     12/20/2016 
+##         - Initial version for IECCF R30.3.3
+##     01/06/2017
+##         - Updated vCCF package to address removal of shared volume for IO VMs
+##     01/19/2017
+##         - Updated vCCF package to address ICE feedback reviewed on 1/13/2017
+##         - Updated to remove Nokia related values and match AT&T environment
+##     02/17/2017
+##         - Updated vCCF package from Nokia
+##     02/23/2017
+##         - Updated with values for ccfx0002v
+##     09/27/2017
+##         - Updated for mini instance in DPA2a - flavor change
+
+parameters:
+
+    plt_flavor_name: nd.c2r4d50
+    iox_flavor_name: nd.c2r4d50
+    app_flavor_name: nd.c2r4d50
+
+    plt_image_name: USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2
+    iox_image_name: USP_IECF-IO_30.3.3-mcas4.4.6.qcow2
+    app_image_name: USP_IECF-APP_30.3.3-mcas4.4.6.qcow2
+
+    ieccf_debug: no
+
+    internal_subnet_cidr: 169.30.12.0/24
+
+    plt_pair_uuid: 573f433e25ba8
+    iox_pair_uuid: 573f433e284b4
+
+# These must be empty for AT&T
+    openstack_cacert: ""
+    config_server_cacert: ""
+
+#    growth_mini_siteinfo_url_01: ""
+
+#
+# Instance specific parameters (using DPA3 info)
+#    vnf_id: 0002
+#    vf_module_id: 0001
+#    vnf_name: ccfx0002v
+#    vf_module_name: module_1
+#
+#    plt_names: 
+#    - ccfx0002vm001
+#    - ccfx0002vm002
+#    iox_names:
+#    - ccfx0002vm003
+#    - ccfx0002vm004
+#    app_names:
+#    - ccfx0002vm005
+#    - ccfx0002vm006
+#    - ccfx0002vm007
+#    - ccfx0002vm008
+#    - ccfx0002vm009
+#    - ccfx0002vm010
+#    - ccfx0002vm011
+# 
+#    ignore_siteinfo_audit: no
+#
+#    availability_zone_0: DPA3_D2_AZ1
+#    availability_zone_1: DPA3_D2_AZ2
+#
+#    plt_security_groups:
+#    - ieccf
+#    iox_security_groups:
+#    - ieccf
+#    app_security_groups:
+#    - ieccf
+#    oam_security_groups:
+#    - ieccf
+#    data_security_groups:
+#    - ieccf
+#
+#    oam_net_id: 491c7cef-a3f4-4990-883e-b0af397466d0
+#    data_net_id: be99b10d-483a-41ba-b6e8-99a8e7fd2fd7
+#    io_net_id: 491c7cef-a3f4-4990-883e-b0af397466d0
+#    internal_net_id: 20cdc5a5-750b-41d4-9760-397551758039
+
+#    siteinfo_url: http://135.144.3.36/imsadmin/ccfx0002v/siteinfo
+#    ieccf_config_url: http://135.144.3.36/imsadmin/ccfx0002v/cfg.tar
+
+#    name_server_1: 2001:1890:1001:2424::1
+#    name_server_2: 2001:1890:1001:2224::1
+#    domain: la1il.uvp.itn.att.net
+#
+#    plt_oam_ips:
+#    - 135.144.3.80
+#    - 135.144.3.82
+#    iox_oam_ips:
+#    - 135.144.3.83
+#    - 135.144.3.85
+#    app_oam_ips:
+#    - 135.144.3.86
+#    - 135.144.3.87
+#    - 135.144.3.88
+#    - 135.144.3.89
+#    - 135.144.3.90
+#    - 135.144.3.91
+#    - 135.144.3.92
+#
+#    plt_data_v6_ips:
+#    - 2001:1890:1001:2B32::29:B
+#    - 2001:1890:1001:2B32::29:D
+#    iox_data_v6_ips:
+#    - 2001:1890:1001:2B32::29:1
+#    - 2001:1890:1001:2B32::29:3
+#    app_data_v6_ips:
+#    - 2001:1890:1001:2B32::29:4
+#    - 2001:1890:1001:2B32::29:5
+#    - 2001:1890:1001:2B32::29:6
+#    - 2001:1890:1001:2B32::29:7
+#    - 2001:1890:1001:2B32::29:8
+#    - 2001:1890:1001:2B32::29:9
+#    - 2001:1890:1001:2B32::29:A
+#
+#
+#    plt_oam_floating_ip: 135.144.3.81
+#    iox_oam_floating_ip: 135.144.3.84
+#
+#    plt_data_floating_v6_ip: 2001:1890:1001:2B32::29:C
+#    iox_data_floating_v6_ip: 2001:1890:1001:2B32::29:2
+#
+#    app_volume_0: 2aea2481-9ffe-4612-8912-bf47999c03e5
+#    app_volume_1: eb40dadc-c1cb-4bb6-90a5-d3eaef672476
+#    app_volume_2: 540dc734-b1cb-4a4d-936d-bd1b4a5d42e8
+#    app_volume_3: f71471f8-00bd-4c35-a92d-4eee12fcc059
+#    app_volume_4: 48aa9e8a-90db-4e8e-9f60-38319825f3ec
+#    app_volume_5: 396d7e57-3103-4934-a324-57b24409eba2
+#    app_volume_6: 61d8a9a5-eceb-44c7-b5d7-da6dec02b8ed
+#    plt_volume_0: 4a04e40f-3e5e-4629-a8e1-799ff0ce75ea
+#    plt_volume_1: 2070242e-d428-4210-a8b8-0c63d9ca00b9
+#    plt_volume_shared_0: 415ec62c-65aa-4fc1-8d55-6cfadf3f4e24
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
new file mode 100644
index 0000000000..1e5d74c9ac
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF.yml
@@ -0,0 +1,1604 @@
+heat_template_version: '2014-10-16'
+description: ''
+
+## Note: Nokia VM HOT file for vCCF
+## Copyright: Nokia 2016
+## Name: "base_vIECCF.yml"
+## Date: 20 Dec 2016
+## Juno Version
+## Version History
+##     12/20/2016 
+##         - Initial version for IECCF R30.3.3
+##     01/06/2017
+##         - Updated vCCF package to address removal of shared volume for IO VMs
+##     01/19/2017
+##         - Updated vCCF package to address ICE feedback reviewed on 1/13/2017
+##         - Updated to remove Nokia related values and match AT&T environment
+##         - Updated vm_role to match vm_type used in the resource naming convention
+##     02/17/2017
+##         - Updated vCCF package from Nokia
+##     06/23/2017
+##         - Updated vCCF package from Nokia to add output parameter for OAM IP address
+##     08/21/2017
+##         - Updated to replace ':' in port resource names with '_'
+##     09/20/2017
+##         - Updated to revert port resource names back to original with embedded ':'
+##         - Updated to replace ':' in port name property with '_'
+##     09/27/2017
+##         - Updated for mini instance in DPA2a - VM reduction
+
+parameters:
+    vnf_id:
+        type: string
+        description: Unique ID for this VF instance
+    vf_module_id:
+        type: string
+        description: Unique ID for this VF Module instance
+    vnf_name:
+        type: string
+        description: Unique name for this VF instance
+    vf_module_name:
+        type: string
+        description: Unique name for this VF Module instance
+
+    plt_names:
+        type: comma_delimited_list
+        description: VM names for plt VMs
+    iox_names:
+        type: comma_delimited_list
+        description: VM names for iox VMs
+    app_names:
+        type: comma_delimited_list
+        description: VM names for app VMs
+
+    openstack_cacert: # Is this needed, and why?
+        type: string
+        label: 'OpenStack CA Certificate'
+        description: 'CA Certificate to use for OpenStack client calls.'
+    config_server_cacert:
+        type: string
+        label: 'configure server CA Certificate'
+        description: 'CA Certificate for download from siteinfo url and config url.'
+        
+#    _template_version_:
+#        type: string
+#        hidden: 'True'
+    ignore_siteinfo_audit:
+        type: string
+        label: 'Siteinfo Audit Ignore Flag'
+        description: 'Set to true if siteinfo audit failure should not prevent system installation'
+
+    availability_zone_0:
+        type: string
+        description: First availability zone ID or Name
+    availability_zone_1:
+        type: string
+        description: Second availability zone ID or Name
+
+    plt_image_name:
+        type: string
+        description: Pilot image
+        
+    plt_flavor_name:
+        type: string
+        description: Pilot flavor
+        
+    plt_security_groups:
+        type: comma_delimited_list
+        description: Pilot security group
+        
+        
+    iox_image_name:
+        type: string
+        description: IO image
+        
+    iox_flavor_name:
+        type: string
+        description: IO flavor
+        
+    iox_security_groups:
+        type: comma_delimited_list
+        description: IO security group
+        
+    app_image_name:
+        type: string
+        description: App image
+        
+    app_flavor_name:
+        type: string
+        description: App flavor
+        
+    app_security_groups:
+        type: comma_delimited_list
+        description: App security group
+        
+    oam_security_groups:
+        type: comma_delimited_list
+        description: OAM security group
+        
+    data_security_groups:
+        type: comma_delimited_list
+        description: DATA security group
+
+    oam_net_id:
+        type: string
+        description: 'OAM network'
+        
+    data_net_id:
+        type: string
+        description: 'DATA network'
+#    io_net_id:
+#        type: string
+#        label: 'IO network'
+
+    siteinfo_url:
+        type: string
+        description: 'siteinfo url'
+    ieccf_config_url:
+        type: string
+        description: 'IECCF configuration package URL'
+    ieccf_debug:
+        type: string
+        description: 'IECCF debug flag'
+#    growth_mini_siteinfo_url_01:
+#        type: string
+#        label: 'IECCF app node growth mini siteinfo URL'
+
+    name_server_1:
+        type: string
+        description: 'IP address of name server 1'
+    name_server_2:
+        type: string
+        description: 'IP address of name server 2'
+    domain:
+        type: string
+        description: What is this domain? 
+
+    plt_oam_ips:
+        type: comma_delimited_list
+        description: Fixed IPv4 assignments for plt VMs on the OAM network
+    iox_oam_ips:
+        type: comma_delimited_list
+        description: Fixed IPv4 assignments for iox VMs on the OAM network
+    app_oam_ips:
+        type: comma_delimited_list
+        description: Fixed IPv4 assignments for app VMs on the OAM network
+
+    plt_data_v6_ips:
+        type: comma_delimited_list
+        description: Fixed IPv6 assignments for plt VMs on the DATA network
+    iox_data_v6_ips:
+        type: comma_delimited_list
+        description: Fixed IPv6 assignments for iox VMs on the DATA network
+    app_data_v6_ips:
+        type: comma_delimited_list
+        description: Fixed IPv6 assignments for app VMs on the DATA network
+
+    plt_oam_floating_ip:
+        type: string
+        description: Floating IPv4 for plt VMs on the OAM network
+    iox_oam_floating_ip:
+        type: string
+        description: Floating IPv4 for iox VMs on the OAM network
+
+    plt_data_floating_v6_ip:
+        type: string
+        description: Floating IPv6 for plt VMs on the DATA network
+    iox_data_floating_v6_ip:
+        type: string
+        description: Floating IPv6 for iox VMs on the DATA network
+
+    internal_subnet_cidr:
+        type: string
+        description: IP subnet for internal network
+
+    plt_pair_uuid:
+        type: string
+        description: UUID for plt VM pair
+    iox_pair_uuid:
+        type: string
+        description: UUID for iox VM pair
+
+    plt_volume_shared_id_0:
+        type: string
+        description: ServiceData2 volume for plt VMs
+
+    plt_volume_id_0:
+        type: string
+        description: ServiceData1 volume for first plt VM
+
+    plt_volume_id_1:
+        type: string
+        description: ServiceData1 volume for second plt VM
+
+    app_volume_id_0:
+        type: string
+        description: ServiceData1 volume for first app VM
+
+    app_volume_id_1:
+        type: string
+        description: ServiceData1 volume for second app VM
+
+    app_volume_id_2:
+        type: string
+        description: ServiceData1 volume for third app VM
+                     
+resources:
+
+    internal_net_0:
+        type: OS::Neutron::Net
+        properties:
+            name:
+                str_replace:
+                    template: $prefix-internal_net_0
+                    params:
+                        $prefix: { get_param: vnf_name }
+            
+    internal_0_subnet_0:
+        type: OS::Neutron::Subnet
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-internal_0_subnet_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            cidr: {get_param: internal_subnet_cidr}
+            network: {get_resource: internal_net_0 }
+            enable_dhcp: 'True'
+            gateway_ip: ''
+
+    app_server_group:
+        type: OS::Nova::ServerGroup
+        properties:
+            name:
+                str_replace:
+                  params:
+                      $vnf_name: {get_param: vnf_name}
+                  template: $vnf_name-app_server_group
+            policies:
+                - anti-affinity
+
+    'node:m001:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [plt_names, 0]}
+            availability_zone:
+                get_param: availability_zone_0
+            image:
+                get_param: plt_image_name
+            flavor:
+                get_param: plt_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            block_device_mapping:
+                -
+                    delete_on_termination: 'false'
+                    device_name: vdb
+                    volume_id:
+                        get_param: plt_volume_id_0
+            networks:
+                -
+                    port:
+                        get_resource: plt_internal_0_port_0
+                -
+                    port:
+                        get_resource: plt_oam_0_port_0
+                -
+                    port:
+                        get_resource: plt_data_0_port_0
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: A
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__:
+                            get_param: openstack_cacert
+#                            get_file: openstack_cacert.crt
+                        __cs_cacert__:
+                            get_param: config_server_cacert
+#                            get_file: config_server_cacert.crt
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: { get_param: domain }
+                        __shared_volid1__:
+#                            get_resource: 'node:m001:m002:shared_vol1'
+                            get_param: plt_volume_shared_id_0
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: plt
+        metadata:
+            mcas_id: m001
+            networks:
+                -
+                    get_attr:
+                        - plt_internal_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - plt_oam_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - plt_data_0_port_0
+                        - network_id
+            mcas_mate_id: m002
+            pair_uuid: {get_param: plt_pair_uuid}
+            shared_vol1: {get_param: plt_volume_shared_id_0}
+    plt_internal_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_internal_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: plt_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+    plt_internal_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_internal_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: plt_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+            
+    plt_oam_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_oam_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:oam:vip:m001:m002'
+#                            - 'network_oam_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [plt_oam_ips, 0]}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam
+
+    plt_oam_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_oam_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:oam:vip:m001:m002'
+#                            - 'network_oam_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [plt_oam_ips, 0]}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam
+
+    plt_data_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_data_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:data:vip:m001:m002'
+#                            - 'network_data_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [plt_data_v6_ips, 0]}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+
+    plt_data_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-plt_data_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:data:vip:m001:m002'
+#                            - 'network_data_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [plt_data_v6_ips, 1]}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+
+    'node:m002:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [plt_names, 1]}
+            availability_zone:
+                get_param: availability_zone_1
+            image:
+                get_param: plt_image_name
+            flavor:
+                get_param: plt_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            block_device_mapping:
+                -
+                    delete_on_termination: 'false'
+                    device_name: vdb
+                    volume_id:
+                        get_param: plt_volume_id_1
+            networks:
+                -
+                    port:
+                        get_resource: plt_internal_0_port_1
+                -
+                    port:
+                        get_resource: plt_oam_0_port_1
+                -
+                    port:
+                        get_resource: plt_data_0_port_1
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: B
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__:
+                            get_param: openstack_cacert
+#                            get_file: openstack_cacert.crt
+                        __cs_cacert__:
+                            get_param: config_server_cacert
+#                            get_file: config_server_cacert.crt
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+                        __shared_volid1__:
+#                            get_resource: 'node:m001:m002:shared_vol1'
+                            get_param: plt_volume_shared_id_0
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: plt
+        metadata:
+            mcas_id: m002
+            networks:
+                -
+                    get_attr:
+                        - plt_internal_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - plt_oam_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - plt_data_1_port_0
+                        - network_id
+            mcas_mate_id: m001
+            pair_uuid: {get_param: plt_pair_uuid}
+            shared_vol1: {get_param: plt_volume_shared_id_0}
+
+    'network:system:vip:m001:m002':
+#    'network_system_vip_m001_m002':
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+#                    template: '$vnf_name-network:system:vip:m001:m002'
+                    template: '$vnf_name-network_system_vip_m001_m002'
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr }
+            security_groups:
+                get_param: plt_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+            pair_uuid: {get_param: plt_pair_uuid}
+    'network:oam:vip:m001:m002':
+#    'network_oam_vip_m001_m002':
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+#                    template: '$vnf_name-network:oam:vip:m001:m002'
+                    template: '$vnf_name-network_oam_vip_m001_m002'
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: plt_oam_floating_ip}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam
+            pair_uuid: {get_param: plt_pair_uuid}
+    'network:data:vip:m001:m002':
+#    'network_data_vip_m001_m002':
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+#                    template: '$vnf_name-network:data:vip:m001:m002'
+                    template: '$vnf_name-network_data_vip_m001_m002'
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: plt_data_floating_v6_ip}
+            security_groups:
+#                get_param: plt_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+            pair_uuid: {get_param: plt_pair_uuid}
+
+    'node:m003:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [iox_names, 0]}
+            availability_zone:
+                get_param: availability_zone_0
+            image:
+                get_param: iox_image_name
+            flavor:
+                get_param: iox_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            networks:
+                -
+                    port:
+                        get_resource: iox_internal_0_port_0
+                -
+                    port:
+                        get_resource: iox_oam_0_port_0
+                -
+                    port:
+                        get_resource: iox_data_0_port_0
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: ''
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__: ''
+                        __cs_cacert__: ''
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+#                        __shared_volid1__:
+#                            get_resource: 'node:m003:m004:shared_vol1'
+#                            get_param: iox_volume_shared_0
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: iox
+        metadata:
+            mcas_id: m003
+            networks:
+                -
+                    get_attr:
+                        - iox_internal_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - iox_oam_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - iox_data_0_port_0
+                        - network_id
+            mcas_mate_id: m004
+            pair_uuid: {get_param: iox_pair_uuid}
+#            shared_vol1: {get_param: iox_volume_shared_0}
+    iox_internal_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_internal_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: iox_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+    iox_oam_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_oam_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:io:vip:m004:m003'
+#                            - 'network_io_vip_m004_m003'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [iox_oam_ips, 0]}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: io
+    iox_data_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_data_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:data:vip:m004:m003'
+#                            - 'network_data_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [iox_data_v6_ips, 0]}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+    'node:m004:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [iox_names, 1]}
+            availability_zone:
+                get_param: availability_zone_1
+            image:
+                get_param: iox_image_name
+            flavor:
+                get_param: iox_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            networks:
+                -
+                    port:
+                        get_resource: iox_internal_0_port_1
+                -
+                    port:
+                        get_resource: iox_oam_0_port_1
+                -
+                    port:
+                        get_resource: iox_data_0_port_1
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: ''
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__: ''
+                        __cs_cacert__: ''
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+#                        __shared_volid1__:
+#                            get_resource: 'node:m003:m004:shared_vol1'
+#                            get_param: iox_volume_shared_0
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: iox
+        metadata:
+            mcas_id: m004
+            networks:
+                -
+                    get_attr:
+                        - iox_internal_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - iox_oam_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - iox_data_1_port_0
+                        - network_id
+            mcas_mate_id: m003
+            pair_uuid: {get_param: iox_pair_uuid}
+#            shared_vol1: {get_param: iox_volume_shared_0}
+    iox_internal_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_internal_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: iox_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+ 
+    iox_oam_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_oam_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:io:vip:m004:m003'
+#                            - 'network_io_vip_m004_m003'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [iox_oam_ips, 1]}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: io
+    iox_data_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-iox_data_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address:
+                        get_attr:
+                            - 'network:data:vip:m004:m003'
+#                            - 'network_data_vip_m001_m002'
+                            - fixed_ips
+                            - 0
+                            - ip_address
+            fixed_ips:
+                -
+                    ip_address: {get_param: [iox_data_v6_ips, 1]}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+    'network:io:vip:m004:m003':
+#    'network_io_vip_m004_m003':
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+#                    template: '$vnf_name-network:io:vip:m004:m003'
+                    template: '$vnf_name-network_io_vip_m004_m003'
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: iox_oam_floating_ip}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: io
+            pair_uuid: {get_param: iox_pair_uuid}
+    'network:data:vip:m004:m003':
+#    'network_data_vip_m004_m003':
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+#                    template: '$vnf_name-network:data:vip:m004:m003'
+                    template: '$vnf_name-network_data_vip_m004_m003'
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: iox_data_floating_v6_ip}
+            security_groups:
+#                get_param: iox_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+            pair_uuid: {get_param: iox_pair_uuid}
+
+    'node:m005:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [app_names, 0]}
+            availability_zone:
+                get_param: availability_zone_0
+            image:
+                get_param: app_image_name
+            flavor:
+                get_param: app_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            block_device_mapping:
+                -
+                    delete_on_termination: 'false'
+                    device_name: vdb
+                    volume_id:
+                        get_param: app_volume_id_0
+            networks:
+                -
+                    port:
+                        get_resource: app_internal_0_port_0
+                -
+                    port:
+                        get_resource: app_oam_0_port_0
+                -
+                    port:
+                        get_resource: app_data_0_port_0
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: ''
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__: ''
+                        __cs_cacert__: ''
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+            scheduler_hints: 
+                group: {get_resource: app_server_group}
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: app
+        metadata:
+            mcas_id: m005
+            networks:
+                -
+                    get_attr:
+                        - app_internal_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_oam_0_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_data_0_port_0
+                        - network_id
+    app_internal_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_internal_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: app_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+    app_oam_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_oam_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_oam_ips, 0]}
+                    
+            security_groups:
+#                get_param: app_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam    
+    
+    app_data_0_port_0:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_data_0_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_data_v6_ips, 0]}
+            security_groups:
+#                get_param: app_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+
+    'node:m006:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [app_names, 1]}
+            availability_zone:
+                get_param: availability_zone_1
+            image:
+                get_param: app_image_name
+            flavor:
+                get_param: app_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            block_device_mapping:
+                -
+                    delete_on_termination: 'false'
+                    device_name: vdb
+                    volume_id:
+                        get_param: app_volume_id_1
+            networks:
+                -
+                    port:
+                        get_resource: app_internal_0_port_1
+                -
+                    port:
+                        get_resource: app_oam_0_port_1
+                -
+                    port:
+                        get_resource: app_data_0_port_1
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: ''
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__: ''
+                        __cs_cacert__: ''
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+            scheduler_hints: 
+                group: {get_resource: app_server_group}
+
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: app
+        metadata:
+            mcas_id: m006
+            networks:
+                -
+                    get_attr:
+                        - app_internal_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_oam_1_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_data_1_port_0
+                        - network_id
+    app_internal_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_internal_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: app_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+    app_oam_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_oam_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_oam_ips, 1]}
+                    
+            security_groups:
+#                get_param: app_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam    
+
+    app_data_0_port_1:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_data_1_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_data_v6_ips, 1]}
+            security_groups:
+#                get_param: app_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+
+    'node:m007:server':
+        type: OS::Nova::Server
+        properties:
+            name: { get_param: [app_names, 2]}
+            availability_zone:
+                get_param: availability_zone_0
+            image:
+                get_param: app_image_name
+            flavor:
+                get_param: app_flavor_name
+            image_update_policy: REBUILD
+            config_drive: 'True'
+            block_device_mapping:
+                -
+                    delete_on_termination: 'false'
+                    device_name: vdb
+                    volume_id:
+                        get_param: app_volume_id_2
+            networks:
+                -
+                    port:
+                        get_resource: app_internal_0_port_2
+                -
+                    port:
+                        get_resource: app_oam_0_port_2
+                -
+                    port:
+                        get_resource: app_data_0_port_2
+            user_data_format: RAW
+            user_data:
+                str_replace:
+                    template:
+                        get_file: node_userdata_script.sh
+#                        get_param: _node_userdata_script_
+                    params:
+                        __heat_stack_name__:
+                            get_param: 'OS::stack_name'
+                        __node_siteinfo_url__: { get_param: siteinfo_url }
+                        __ieccf_config_url__: { get_param: ieccf_config_url }
+                        __ieccf_debug__: { get_param: ieccf_debug }
+                        __activepilot_ip__:
+                            get_attr:
+                                - 'network:system:vip:m001:m002'
+#                                - 'network_system_vip_m001_m002'
+                                - fixed_ips
+                                - 0
+                                - ip_address
+                        __host_key__:
+                            get_attr:
+                                - 'sysinfo:host_key'
+                                - value
+                        __pilot__: ''
+                        __script_url__: ''
+                        __script_args__: ''
+                        __os_cacert__: ''
+                        __cs_cacert__: ''
+                        __post_exec__: ''
+                        __ignore_siteinfo_audit__:
+                            get_param: ignore_siteinfo_audit
+                        __nameserver1__: {get_param: name_server_1}
+                        __nameserver2__: {get_param: name_server_2}
+                        __domain__: {get_param: domain}
+            scheduler_hints: 
+                group: {get_resource: app_server_group}
+
+            metadata:
+                vnf_id: {get_param: vnf_id}
+                vnf_name: {get_param: vnf_name}
+                vf_module_id: {get_param: vf_module_id}
+                vf_module_name: {get_param: vf_module_name}
+                vm_role: app
+        metadata:
+            mcas_id: m007
+            networks:
+                -
+                    get_attr:
+                        - app_internal_2_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_oam_2_port_0
+                        - network_id
+                -
+                    get_attr:
+                        - app_data_2_port_0
+                        - network_id
+    app_internal_0_port_2:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_internal_2_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: {get_resource: internal_net_0 }
+            replacement_policy: AUTO
+            allowed_address_pairs:
+                -
+                    ip_address: {get_param: internal_subnet_cidr}
+            security_groups:
+                get_param: app_security_groups
+        metadata:
+            os_net: {get_resource: internal_net_0 }
+
+    app_oam_0_port_2:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_oam_2_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: oam_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_oam_ips, 2]}
+                    
+            security_groups:
+#                get_param: app_security_groups
+                get_param: oam_security_groups
+        metadata:
+            os_net: { get_param: oam_net_id }
+            ext_net: oam    
+
+    app_data_0_port_2:
+        type: OS::Neutron::Port
+        properties:
+            name:
+                str_replace:
+                    template: $vnf_name-app_data_2_port_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+            network: { get_param: data_net_id }
+            replacement_policy: AUTO
+            fixed_ips:
+                -
+                    ip_address: {get_param: [app_data_v6_ips, 2]}
+            security_groups:
+#                get_param: app_security_groups
+                get_param: data_security_groups
+        metadata:
+            os_net: { get_param: data_net_id }
+            ext_net: data
+
+
+    'sysinfo:input_store':  # What is the purpose of this?
+        type: 'OS::Heat::RandomString'
+        metadata:
+            parameters:
+                vnf_name:
+                    get_param: vnf_name
+                __os_cacert__:
+                    get_param: openstack_cacert
+#                    get_file: openstack_cacert.crt
+                __cs_cacert__:
+                    get_param: config_server_cacert
+#                    get_file: config_server_cacert.crt
+                ignore_siteinfo_audit:
+                    get_param: ignore_siteinfo_audit
+                m001_avail_zone:
+                    get_param: availability_zone_0
+                m001_image:
+                    get_param: plt_image_name
+                m001_flavor:
+                    get_param: plt_flavor_name
+                m001_security_groups:
+                    get_param: plt_security_groups
+                m002_avail_zone:
+                    get_param: availability_zone_1
+                m002_image:
+                    get_param: plt_image_name
+                m002_flavor:
+                    get_param: plt_flavor_name
+                m002_security_groups:
+                    get_param: plt_security_groups
+                m003_avail_zone:
+                    get_param: availability_zone_0
+                m003_image:
+                    get_param: iox_image_name
+                m003_flavor:
+                    get_param: iox_flavor_name
+                m003_security_groups:
+                    get_param: iox_security_groups
+                m004_avail_zone:
+                    get_param: availability_zone_1
+                m004_image:
+                    get_param: iox_image_name
+                m004_flavor:
+                    get_param: iox_flavor_name
+                m004_security_groups:
+                    get_param: iox_security_groups
+                m005_avail_zone:
+                    get_param: availability_zone_0
+                m005_image:
+                    get_param: app_image_name
+                m005_flavor:
+                    get_param: app_flavor_name
+                m005_security_groups:
+                    get_param: app_security_groups
+                m006_avail_zone:
+                    get_param: availability_zone_1
+                m006_image:
+                    get_param: app_image_name
+                m006_flavor:
+                    get_param: app_flavor_name
+                m006_security_groups:
+                    get_param: app_security_groups
+                m007_avail_zone:
+                    get_param: availability_zone_0
+                m007_image:
+                    get_param: app_image_name
+                m007_flavor:
+                    get_param: app_flavor_name
+                m007_security_groups:
+                    get_param: app_security_groups
+                m008_avail_zone:
+                    get_param: availability_zone_1
+                m008_image:
+                    get_param: app_image_name
+                m008_flavor:
+                    get_param: app_flavor_name
+                m008_security_groups:
+                    get_param: app_security_groups
+                m009_avail_zone:
+                    get_param: availability_zone_0
+                m009_image:
+                    get_param: app_image_name
+                m009_flavor:
+                    get_param: app_flavor_name
+                m009_security_groups:
+                    get_param: app_security_groups
+                m010_avail_zone:
+                    get_param: availability_zone_1
+                m010_image:
+                    get_param: app_image_name
+                m010_flavor:
+                    get_param: app_flavor_name
+                m010_security_groups:
+                    get_param: app_security_groups
+                m011_avail_zone:
+                    get_param: availability_zone_0
+                m011_image:
+                    get_param: app_image_name
+                m011_flavor:
+                    get_param: app_flavor_name
+                m011_security_groups:
+                    get_param: app_security_groups
+    'sysinfo:host_key':
+        type: 'OS::Heat::RandomString'
+        properties:
+            length: 255
+
+outputs:
+    oam_management_v4_address:
+        value: {get_param: plt_oam_floating_ip}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.env
new file mode 100644
index 0000000000..e8d6513ee3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.env
@@ -0,0 +1,33 @@
+## Note: Nokia Volume ENV file for vCCF
+## Copyright: Nokia 2016
+## Name: "base_vIECCF_volume.env"
+## Date: 20 Dec 2016
+## Juno Version
+## Version History
+##     12/20/2016 
+##         - Initial version for IECCF R30.3.3
+##     01/06/2017
+##         - Updated vCCF package to address removal of shared volume for IO VMs
+##     01/19/2017
+##         - Updated vCCF package to address ICE feedback reviewed on 1/13/2017
+##         - Updated to remove Nokia related values and match AT&T environment
+##     02/17/2017
+##         - Updated vCCF package from Nokia
+##     02/23/2017
+##         - Updated with values for ccfx0002v
+##     07/05/2017
+##         - Modified servicedata1/2 and app volume sizes to include space for eccfdata and incoming4cdrsch
+##     09/27/2017
+##         - Updated for mini instance in DPA2a - vol size change
+
+parameters:
+
+    plt_servicedata1_volume_size_0: 70
+    plt_servicedata2_volume_size_0: 150
+
+    app_volume_size_0: 130
+
+#
+# Instance specific parameters (using DPA3 info)
+#
+#    vnf_name: ccfx0002v
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.yml
new file mode 100644
index 0000000000..073b102c6d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/base_vIECCF_volume.yml
@@ -0,0 +1,139 @@
+heat_template_version: 2014-10-16
+
+description: Volume creation template for vCCF
+
+## Note: Nokia Volume HOT file for vCCF
+## Copyright: Nokia 2016
+## Name: "base_vIECCF_volume.yml"
+## Date: 20 Dec 2016
+## Juno Version
+## Version History
+##     12/20/2016 
+##         - Initial version for IECCF R30.3.3
+##     01/06/2017
+##         - Updated vCCF package to address removal of shared volume for IO VMs
+##     01/19/2017
+##         - Updated vCCF package to address ICE feedback reviewed on 1/13/2017
+##         - Updated to remove Nokia related values and match AT&T environment
+##     02/17/2017
+##         - Updated vCCF package from Nokia
+##     09/27/2017
+##         - Updated for mini instance in DPA2a - vol reduction to match number of VMs
+
+parameters:
+    vnf_name:
+        type: string
+        description: Unique name for this VF instance
+        
+    plt_servicedata1_volume_size_0:
+        type: number
+        description: Size of Service Data 1 Volume for plt VMs
+        constraints:
+          - range: { min: 1, max: 9999 }
+            description: "Must be between 1 and 9999 GB"
+            
+    plt_servicedata2_volume_size_0:
+        type: number
+        description: Size of Service Data 2 Volume for plt VMs
+        constraints:
+          - range: { min: 1, max: 9999 }
+            description: "Must be between 1 and 9999 GB"
+            
+    app_volume_size_0: 
+        type: number
+        description: Size of Service Data 1 Volume for app VMs
+        constraints:
+          - range: { min: 1, max: 9999 }
+            description: "Must be between 1 and 9999 GB"
+
+resources:
+    plt_volume_shared_0:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: plt_servicedata2_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-plt_volume_shared_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+    plt_volume_0:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: plt_servicedata1_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-plt_volume_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+    plt_volume_1:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: plt_servicedata1_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-plt_volume_1
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+    app_volume_0:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: app_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-app_volume_0
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+    app_volume_1:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: app_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-app_volume_1
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+    app_volume_2:
+        type: OS::Cinder::Volume
+        properties:
+            size: { get_param: app_volume_size_0 }
+            name: 
+                str_replace:
+                    template: $vnf_name-app_volume_2
+                    params:
+                        $vnf_name:
+                            get_param: vnf_name
+
+outputs:
+    plt_volume_shared_id_0:
+        description: ServiceData2 volume for plt VMs
+        value: {get_resource: plt_volume_shared_0}
+
+    plt_volume_id_0:
+        description: ServiceData1 volume for first plt VM
+        value: {get_resource: plt_volume_0}
+
+    plt_volume_id_1:
+        description: ServiceData1 volume for second plt VM
+        value: {get_resource: plt_volume_1}
+
+    app_volume_id_0:
+        description: ServiceData1 volume for first app VM
+        value: {get_resource: app_volume_0}
+
+    app_volume_id_1:
+        description: ServiceData1 volume for second app VM
+        value: {get_resource: app_volume_1}
+
+    app_volume_id_2:
+        description: ServiceData1 volume for third app VM
+        value: {get_resource: app_volume_2}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/node_userdata_script.sh b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/node_userdata_script.sh
new file mode 100644
index 0000000000..637c7ac649
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/in/node_userdata_script.sh
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+# Save cs_cacert file
+cs_cacert="__cs_cacert__"
+[[ -n $cs_cacert ]] && {
+    echo "$cs_cacert" > /etc/ieccf/conf/cs_cacert
+    chmod 400 /etc/ieccf/conf/cs_cacert
+}
+      
+typeset -l ENABLE_DEBUG="__ieccf_debug__"
+[[ "$ENABLE_DEBUG" == "t" || "$ENABLE_DEBUG" == "y" ]] && export DEBUG=YES
+
+# Store ieccf config url in /etc/ieccf/conf/ieccf_config_url
+ic_url="__ieccf_config_url__"
+[[ -n $ic_url ]] && echo "$ic_url" > /etc/ieccf/conf/ieccf_config_url
+
+mkdir -p /etc/psp
+
+#
+# Common code for all nodes
+#
+
+# store VMID in /etc/psp/vmid
+cat /var/lib/cloud/data/instance-id > /etc/psp/vmid 2>/dev/null
+
+# Store siteinfo url in /etc/psp/siteinfo_url
+stack_name="__heat_stack_name__"
+[[ -n $stack_name ]] && echo "$stack_name" > /etc/psp/heat_stack_name
+
+# Store siteinfo url in /etc/psp/siteinfo_url
+si_url="__node_siteinfo_url__"
+[[ -n $si_url ]] && echo "$si_url" > /etc/psp/siteinfo_url
+
+# Store ActivePilot IP in /etc/psp/ActivePilot
+activepilot_ip=__activepilot_ip__
+[[ -n $activepilot_ip ]] && echo $activepilot_ip > /etc/psp/ActivePilot
+
+# Inject an ActivePilot route
+echo "$(</etc/psp/ActivePilot) dev eth0" > /etc/sysconfig/network-scripts/route-cloud0
+/etc/sysconfig/network-scripts/ifup-routes cloud0
+
+# Store host security key in /etc/psp/host_key
+host_key="__host_key__"
+[[ -n $host_key ]] && {
+echo "$host_key" > /etc/psp/host_key
+chmod 400 /etc/psp/host_key
+}
+
+# Store shared volume ID in /etc/psp/shared_volid1
+shared_volid1="__shared_volid1__"
+[[ $shared_volid1 != __*__  ]] && {
+echo "$shared_volid1" > /etc/psp/shared_volid1
+chmod 400 /etc/psp/shared_volid1
+}
+
+#
+# Pilot code
+#
+
+typeset -u pilot="__pilot__"
+[[ -n $pilot ]] || exit 0
+
+# Set I_am file
+rm -f /root/.I_am_[AB]
+touch /root/.I_am_$pilot
+
+# Allow SSH via Password
+sed -i 's/^#PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+sed -i 's/^PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+service sshd restart
+
+# Pass ignore_audit through template
+typeset -u ignore_audit="__ignore_siteinfo_audit__"
+case $ignore_audit in
+    1|T|TRUE|ON|Y|YES) touch /root/ignore_audit;;
+esac
+    
+# Save os_cacert file
+os_cacert="__os_cacert__"
+[[ -n $os_cacert ]] && {
+    echo "$os_cacert" > /etc/psp/os_cacert
+    chmod 400 /etc/psp/os_cacert
+}
+
+# Update resolv.conf based on passed nameserver and domain
+nameserver1="__nameserver1__"
+nameserver2="__nameserver2__"
+domain="__domain__"
+[[ -n $nameserver1 ]] && {
+  # Need to modify the ifup-dhcp script so that ifup LSN doesn't append
+  # unwanted entries to resolv.conf
+  # This is necessary to support releases where udhcpc client is still used for internal
+  sed -i '/RESOLV_CONF=/a RESOLV_CONF="/tmp/resolv.overridden"' /etc/sysconfig/network-scripts/ifup-dhcp
+  
+  # Kill off any running DHCP clients as they may re-write resolv.conf
+  pkill -f /sbin/dhclient
+  
+  > /etc/resolv.conf
+  echo "; set by MCAS userdata script DHCP override" >> /etc/resolv.conf
+  [[ -n $domain ]] && echo search $domain >> /etc/resolv.conf
+  echo nameserver $nameserver1 >> /etc/resolv.conf
+  [[ -n $nameserver2 ]] && echo nameserver $nameserver2 >> /etc/resolv.conf
+  
+  # Need to set PEERDNS in network for RHEL6 dhclient support as
+  # dhclient-script doesn't read ifcfg files correctly
+  grep -qs PEERDNS=no /etc/sysconfig/network || echo PEERDNS=no >> /etc/sysconfig/network
+  
+  
+  # Update ifcfg files to prevent DHCP client resolv.conf changes
+  for f in /etc/sysconfig/network-scripts/ifcfg-cloud*; do
+    ifup ${f##ifcfg-} &
+  done
+}
+      
+# Localize exists, kick that off and exit
+if [[ -f /opt/config/bin/Localize ]]; then
+    rm -f /install/fresh.install
+    typeset -A args=([A]=install)
+    /opt/config/bin/Localize ${args[$pilot]} &
+else
+    # No Localize, Staging install, just setup and autoinstall
+    # will kick off newinstall1
+    mkdir -p /install
+    touch /install/fresh.install
+fi
+
+script_url="__script_url__"
+script_args="__script_args__"
+
+if [[ -n $script_url ]]; then
+tmp_script=/tmp/pilot${pilot}_startup
+# Delete any pre-existing script, we don't want to execute an old, leftover script
+rm -f $tmp_script
+while true; do
+    curl --connect-timeout 5 -o $tmp_script -gf $script_url 2>> ${tmp_script}.curl.out
+    [[ -f $tmp_script ]] && break
+    # Break for a detected SU/CPR in progress
+    [[ -f /root/.SU_inprog ]] && echo "SU detected" && exit 0
+    [[ -f /root/.CPR_inprog ]] && echo "CPR detected" && exit 0
+    echo "Download of $script_url failed, and no SU/CPR detected.  Waiting to try again."
+    sleep 3
+done
+
+chmod +x $tmp_script
+$tmp_script $script_args > ${tmp_script}.out; rc=$?
+(( rc == 0 )) || exit $rc
+fi
+
+post_exec="__post_exec__"
+eval $post_exec &
+
+exit 0
\ No newline at end of file