[VVP] update heat templates for vLBMS

Change-Id: Iaf9d947a430a695158ccaa11e41b23904d14fffc
Issue-ID: VVP-151
Signed-off-by: stark, steven <steven.stark@att.com>

4 files changed, 280 insertions, 150 deletions

diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index 8db3eacd..596d483a 100644
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -1,36 +1,58 @@
 parameters:
+
+  # VM_TYPE: vlb
   vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
   vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
-  public_net_id: PUT THE NETWORK ID HERE
+  vlb_name_0: zdfw1lb01lb01
   vlb_private_net_id: zdfw1lb01_private
-  pktgen_private_net_id: zdfw1pktgen01_private
+  vlb_private_net_cidr: 192.168.10.0/24
+  vlb_int_private_ip_0: 192.168.10.111
+  vlb_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VLB
+  vlb_int_pktgen_private_ip_0: 192.168.9.111
+  key_name: vlb_key
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+
+  # VM_TYPE: vdns
+  vdns_name_0: zdfw1lb01dns01
+  vdns_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+  vdns_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
+  vdns_int_private_ip_0: 192.168.10.211
+  vdns_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
+
+  # VM_TYPE: vpg
+  vpg_name_0: zdfw1lb01pg01
+  vpg_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+  vpg_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
+  vpg_int_pktgen_private_ip_0: 192.168.9.110
+  vpg_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VPKTGEN
+
+  # NETWORK_ROLE: onap_private
   onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
-  vlb_private_net_cidr: 192.168.10.0/24
-  pktgen_private_net_cidr: 192.168.9.0/24
   onap_private_net_cidr: PUT THE ONAP NETWORK CIDR HERE
-  vlb_private_ip_0: 192.168.10.111
-  vlb_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VLB
-  vlb_private_ip_2: 192.168.9.111
-  vdns_private_ip_0: 192.168.10.211
-  vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
-  vpg_private_ip_0: 192.168.9.110
-  vpg_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VPKTGEN
+
+  # NETWORK_ROLE: pktgen_private
+  pktgen_private_net_id: zdfw1pktgen01_private
+  pktgen_private_net_cidr: 192.168.9.0/24
+
+  # NETWORK_ROLE: public
+  public_net_id: PUT THE NETWORK ID HERE
+
+  # METADATA
+  vnf_name: vLBMS
+  vnf_id: vLoadBalancer_demo_app
+  vf_module_id: vLoadBalancer
+
+  # APP/USER_DATA
   vip: 192.168.9.112
   gre_ipaddr: 192.168.10.112
   pg_int: 192.168.9.109
-  vlb_name_0: zdfw1lb01lb01
-  vdns_name_0: zdfw1lb01dns01
-  vpg_name_0: zdfw1lb01pg01
-  dns_enabled: true
-  vnf_id: vLoadBalancer_demo_app
-  vf_module_id: vLoadBalancer
+  #dns_enabled: true
   dcae_collector_ip: 10.0.4.1
   dcae_collector_port: 8081
   nb_api_version: 1.2.0
   demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.3.0-SNAPSHOT
-  key_name: vlb_key
-  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
+  nexus_artifact_repo: https://nexus.onap.org
diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index e96cf624..cf4fce1a 100644
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/base_vlb.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -41,6 +41,22 @@ parameters:
     type: string
     label: Flavor
     description: Type of instance (flavor) to be used
+  vdns_image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  vdns_flavor_name:
+    type: string
+    label: Flavor
+    description: Type of instance (flavor) to be used
+  vpg_image_name:
+    type: string
+    label: Image name or ID
+    description: Image to be used for compute instance
+  vpg_flavor_name:
+    type: string
+    label: Flavor
+    description: Type of instance (flavor) to be used
   public_net_id:
     type: string
     label: Public network name or ID
@@ -73,31 +89,31 @@ parameters:
     type: string
     label: ONAP private network CIDR
     description: The CIDR of the protected private network
-  vlb_private_ip_0:
+  vlb_int_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the private network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-  vlb_private_ip_1:
+  vlb_onap_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components
-  vlb_private_ip_2:
+  vlb_int_pktgen_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the vPacketGen network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen
-  vdns_private_ip_0:
+  vdns_int_private_ip_0:
     type: string
     label: vDNS private IP address towards the private network
     description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
-  vdns_private_ip_1:
+  vdns_onap_private_ip_0:
     type: string
     label: vDNS private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vDNS to communicate with ONAP components
-  vpg_private_ip_0:
+  vpg_int_pktgen_private_ip_0:
     type: string
     label: vPacketGen private IP address towards the vPacketGen private network
     description: Private IP address that is assigned to the vPacketGen to communicate with the vLoadBalancer
-  vpg_private_ip_1:
+  vpg_onap_private_ip_0:
     type: string
     label: vPacketGen private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vPacketGen to communicate with ONAP components
@@ -129,6 +145,10 @@ parameters:
     type: string
     label: VNF ID
     description: The VNF ID is provided by ONAP
+  vnf_name:
+    type: string
+    label: VNF NAME
+    description: The VNF NAME is provided by ONAP
   vf_module_id:
     type: string
     label: vFirewall module ID
@@ -168,13 +188,15 @@ parameters:
   nexus_artifact_repo:
     type: string
     description: Root URL for the Nexus repository for Maven artifacts.
-    default: "https://nexus.onap.org"
+    # Default parameters prohibited
+    # default: "https://nexus.onap.org"
   sec_group:
     type: string
     description: ONAP Security Group
-  dns_enabled:
-    type: string
-    description: Enable/disable DNS (by default use true)
+  # all params must be used
+  #dns_enabled:
+  #  type: string
+  #  description: Enable/disable DNS (by default use true)
 
 #############
 #           #
@@ -184,106 +206,141 @@ parameters:
 
 resources:
 
-  random-str:
+  random-str_0:
     type: OS::Heat::RandomString
     properties:
       length: 4
 
-  my_keypair:
+  my_keypair_0:
     type: OS::Nova::KeyPair
     properties:
-      name: 
+      name:
         str_replace:
-          template: base_rand
+          template: vnfname_base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }  
+            rand: { get_resource: random-str_0 }
+            vnfname: { get_param: vnf_name }
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  vlb_private_network:
+  # NETWORK_ROLE: private
+  int_private_network:
     type: OS::Neutron::Net
     properties:
-      name: { get_param: vlb_private_net_id }
+      name:
+        str_replace:
+          template: vnfname_privatenetid
+          params:
+            privatenetid: { get_param: vlb_private_net_id }
+            vnfname: { get_param: vnf_name }
 
-  vlb_private_subnet:
+  # NETWORK_ROLE: private
+  int_private_subnet_0:
     type: OS::Neutron::Subnet
     properties:
-      name: { get_param: vlb_private_net_id }
-      network_id: { get_resource: vlb_private_network }
+      name:
+        str_replace:
+          template: vnfname_privatenetid_subnet
+          params:
+            privatenetid: { get_param: vlb_private_net_id }
+            vnfname: { get_param: vnf_name }
+      network: { get_resource: int_private_network }
       cidr: { get_param: vlb_private_net_cidr }
 
-  pktgen_private_network:
+  # NETWORK_ROLE: pktgen_private
+  int_pktgen_private_network:
     type: OS::Neutron::Net
     properties:
-      name: { get_param: pktgen_private_net_id }
+      name:
+        str_replace:
+          template: vnfname_privatenetid
+          params:
+            privatenetid: { get_param: pktgen_private_net_id }
+            vnfname: { get_param: vnf_name }
 
-  pktgen_private_subnet:
+  # NETWORK_ROLE: pktgen_private
+  int_pktgen_private_subnet_0:
     type: OS::Neutron::Subnet
     properties:
-      name: { get_param: pktgen_private_net_id }
-      network_id: { get_resource: pktgen_private_network }
+      name:
+        str_replace:
+          template: vnfname_privatenetid_subnet
+          params:
+            privatenetid: { get_param: pktgen_private_net_id }
+            vnfname: { get_param: vnf_name }
+      network: { get_resource: int_pktgen_private_network }
       cidr: { get_param: pktgen_private_net_cidr }
 
-  vlb_private_0_port:
+  # NETWORK_ROLE: private
+  # VM_TYPE: vlb
+  vlb_0_int_private_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: vlb_private_network }
-      fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}]
+      network: { get_resource: int_private_network }
+      fixed_ips: [{"subnet": { get_resource: int_private_subnet_0 }, "ip_address": { get_param: vlb_int_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vlb_private_1_port:
+  # NETWORK_ROLE: onap_private
+  # VM_TYPE: vlb
+  vlb_0_onap_private_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}]
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_onap_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vlb_private_2_port:
+  # NETWORK_ROLE: pktgen_private
+  # VM_TYPE: vlb
+  vlb_0_int_pktgen_private_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: pktgen_private_network }
-      fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vlb_private_ip_2 }}]
+      network: { get_resource: int_pktgen_private_network }
+      fixed_ips: [{"subnet": { get_resource: int_pktgen_private_subnet_0 }, "ip_address": { get_param: vlb_int_pktgen_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vlb_0:
+  # VM_TYPE: vlb
+  vlb_server_0:
     type: OS::Nova::Server
     properties:
       image: { get_param: vlb_image_name }
       flavor: { get_param: vlb_flavor_name }
       name: { get_param: vlb_name_0 }
-      key_name: { get_resource: my_keypair }
+      key_name: { get_resource: my_keypair_0 }
       networks:
         - network: { get_param: public_net_id }
-        - port: { get_resource: vlb_private_0_port }
-        - port: { get_resource: vlb_private_1_port }
-        - port: { get_resource: vlb_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+        - port: { get_resource: vlb_0_int_private_port_0 }
+        - port: { get_resource: vlb_0_onap_private_port_0 }
+        - port: { get_resource: vlb_0_int_pktgen_private_port_0 }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+        vf_module_id: { get_param: vf_module_id }
+        vnf_name: { get_param: vnf_name }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
             __dcae_collector_ip__: { get_param: dcae_collector_ip }
             __dcae_collector_port__: { get_param: dcae_collector_port }
-            __ip_to_dns_net__: { get_param: vlb_private_ip_0 }
-            __ip_to_pktgen_net__: { get_param: vlb_private_ip_2 }
-            __oam_vpktgen_ip__: { get_param: vpg_private_ip_1 }
-            __oam_vdns_ip__: { get_param: vdns_private_ip_1 }
+            __ip_to_dns_net__: { get_param: vlb_int_private_ip_0 }
+            __ip_to_pktgen_net__: { get_param: vlb_int_pktgen_private_ip_0 }
+            __oam_vpktgen_ip__: { get_param: vpg_onap_private_ip_0 }
+            __oam_vdns_ip__: { get_param: vdns_onap_private_ip_0 }
             __vip__: { get_param: vip }
             __gre_ipaddr__: { get_param: gre_ipaddr }
-            __pktgen_ipaddr__: { get_param: vpg_private_ip_0 }
-            __vdns_ipaddr__: { get_param: vdns_private_ip_0 }
-            __oam_private_ipaddr__: { get_param: vlb_private_ip_1 }
+            __pktgen_ipaddr__: { get_param: vpg_int_pktgen_private_ip_0 }
+            __vdns_ipaddr__: { get_param: vdns_int_private_ip_0 }
+            __oam_private_ipaddr__: { get_param: vlb_onap_private_ip_0 }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr }
-            __pktgen_mac__: { get_attr: [vpg_private_0_port, mac_address] }
+            __pktgen_mac__: { get_attr: [vpg_0_int_pktgen_private_port_0, mac_address] }
             __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
@@ -323,43 +380,51 @@ resources:
             ./v_lb_install.sh
 
 
-  vdns_private_0_port:
+  # NETWORK_ROLE: private
+  # VM_TYPE: vdns
+  vdns_0_int_private_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: vlb_private_network }
-      fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
+      network: { get_resource: int_private_network }
+      fixed_ips: [{"subnet": { get_resource: int_private_subnet_0 }, "ip_address": { get_param: vdns_int_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vdns_private_1_port:
+  # NETWORK_ROLE: onap_private
+  # VM_TYPE: vdns
+  vdns_0_onap_private_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_onap_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vdns_0:
+  # VM_TYPE: vdns
+  vdns_server_0:
     type: OS::Nova::Server
     properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
+      image: { get_param: vdns_image_name }
+      flavor: { get_param: vdns_flavor_name }
       name: { get_param: vdns_name_0 }
-      key_name: { get_resource: my_keypair }
+      key_name: { get_resource: my_keypair_0 }
       networks:
         - network: { get_param: public_net_id }
-        - port: { get_resource: vdns_private_0_port }
-        - port: { get_resource: vdns_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+        - port: { get_resource: vdns_0_int_private_port_0 }
+        - port: { get_resource: vdns_0_onap_private_port_0 }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+        vf_module_id: { get_param: vf_module_id }
+        vnf_name: { get_param: vnf_name }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __lb_oam_int__: { get_param: vlb_private_ip_1 }
-            __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
-            __lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
-            __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
-            __oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
+            __lb_oam_int__: { get_param: vlb_onap_private_ip_0 }
+            __lb_private_ipaddr__: { get_param: vlb_int_private_ip_0 }
+            __lb_to_pktgen_if__: { get_param: vlb_int_pktgen_private_ip_0}
+            __local_private_ipaddr__: { get_param: vdns_int_private_ip_0 }
+            __oam_private_ipaddr__: { get_param: vdns_onap_private_ip_0 }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -394,47 +459,56 @@ resources:
             ./v_dns_install.sh
 
 
-  vpg_private_0_port:
+  # NETWORK_ROLE: pktgen_private
+  # VM_TYPE: vpg
+  vpg_0_int_pktgen_private_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: pktgen_private_network }
-      fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]
+      network: { get_resource: int_pktgen_private_network }
+      fixed_ips: [{"subnet": { get_resource: int_pktgen_private_subnet_0 }, "ip_address": { get_param: vpg_int_pktgen_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vpg_private_1_port:
+  # NETWORK_ROLE: onap_private
+  # VM_TYPE: vpg
+  vpg_0_onap_private_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}]
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_onap_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vpg_0:
+  # VM_TYPE: vpg
+  vpg_server_0:
     type: OS::Nova::Server
     properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
+      image: { get_param: vpg_image_name }
+      flavor: { get_param: vpg_flavor_name }
       name: { get_param: vpg_name_0 }
-      key_name: { get_resource: my_keypair }
+      key_name: { get_resource: my_keypair_0 }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+        vf_module_id: { get_param: vf_module_id }
+        vnf_name: { get_param: vnf_name }
       networks:
         - network: { get_param: public_net_id }
-        - port: { get_resource: vpg_private_0_port }
-        - port: { get_resource: vpg_private_1_port }
+        - port: { get_resource: vpg_0_int_pktgen_private_port_0 }
+        - port: { get_resource: vpg_0_onap_private_port_0 }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __local_private_ipaddr__: { get_param: vpg_private_ip_0 }
-            __oam_private_ipaddr__: { get_param: vpg_private_ip_1 }
+            __local_private_ipaddr__: { get_param: vpg_int_pktgen_private_ip_0 }
+            __oam_private_ipaddr__: { get_param: vpg_onap_private_ip_0 }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr }
-            __vlb_ipaddr__: { get_param: vlb_private_ip_2 }
+            __vlb_ipaddr__: { get_param: vlb_int_pktgen_private_ip_0 }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
             __pg_int__: { get_param: pg_int }
-            __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] }
+            __vlb_mac__: { get_attr: [vlb_0_int_pktgen_private_port_0, mac_address] }
             __cloud_env__: { get_param: cloud_env }
             __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
           template: |
@@ -463,4 +537,10 @@ resources:
             unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh
             cd /opt
             chmod +x v_packetgen_install.sh
-            ./v_packetgen_install.sh
\ No newline at end of file
+            ./v_packetgen_install.sh
+
+outputs:
+  int_private_subnet_id:
+    value: { get_resource: int_private_subnet_0 }
+  int_private_net_id:
+    value: { get_resource: int_private_network }
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index 44b934b8..4d68239b 100644
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -1,24 +1,40 @@
 parameters:
-  vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
-  vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
-  public_net_id: PUT THE NETWORK ID HERE
-  vlb_private_net_id: zdfw1lb01_private
+  # VM_TYPE: vlb
+  vlb_int_private_ip_0: 192.168.10.111
+  vlb_onap_private_ip_0: PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE
+  vlb_int_pktgen_private_ip_0: 192.168.9.111
+  vlb_private_net_cidr: 192.168.10.0/24
+  key_name: vlb_key_scaling
+  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
+
+  # VM_TYPE: vlb
+  vdns_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+  vdns_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
+  vdns_int_private_ip_0: 192.168.10.212
+  vdns_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
+  vdns_name_0: zdfw1lb01dns02
+
+  # NETWORK_ROLE: onap_private
   onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
-  vlb_private_net_cidr: 192.168.10.0/24
   onap_private_net_cidr: PUT THE ONAP NETWORK CIDR HERE
-  vlb_private_ip_0: 192.168.10.111
-  vlb_private_ip_1: PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE
-  vlb_private_ip_2: 192.168.9.111
-  vdns_private_ip_0: 192.168.10.212
-  vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
-  vdns_name_0: zdfw1lb01dns02
-  dns_enabled: true
+
+  # NETWORK_ROLE: private
+  int_private_net_id: vLBMS_zdfw1lb01_private
+  int_private_subnet_id: vLBMS_zdfw1lb01_private_subnet
+
+  # NETWORK_ROLE: public
+  public_net_id: PUT THE NETWORK ID HERE
+
+  # METADATA
   vnf_id: vLoadBalancer_demo_app
   vf_module_id: vLoadBalancer
+  vnf_name: vLBMS
+
+  # APP/USER_DATA
   nb_api_version: 1.2.0
   install_script_version: 1.3.0-SNAPSHOT
-  key_name: vlb_key_scaling
-  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
+  #dns_enabled: true
+  nexus_artifact_repo: https://nexus.onap.org
diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml
index 7dcc4628..214058b9 100644
--- a/heat/vLBMS/dnsscaling.yaml
+++ b/heat/vLBMS/dnsscaling.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -33,11 +33,11 @@ description: Heat template to deploy a vDNS for ONAP (scaling-up scenario)
 ##############
 
 parameters:
-  vlb_image_name:
+  vdns_image_name:
     type: string
     label: Image name or ID
     description: Image to be used for compute instance
-  vlb_flavor_name:
+  vdns_flavor_name:
     type: string
     label: Flavor
     description: Type of instance (flavor) to be used
@@ -45,10 +45,14 @@ parameters:
     type: string
     label: Public network name or ID
     description: Public network that enables remote connection to VNF
-  vlb_private_net_id:
+  int_private_net_id:
     type: string
     label: vLoadBalancer private network name or ID
     description: Private network that connects vLoadBalancer with vDNSs
+  int_private_subnet_id:
+    type: string
+    label: vLoadBalancer private subnet name or ID
+    description: Private subnet that connects vLoadBalancer with vDNSs
   onap_private_net_id:
     type: string
     label: ONAP management network name or ID
@@ -65,23 +69,23 @@ parameters:
     type: string
     label: ONAP private network CIDR
     description: The CIDR of the protected private network
-  vlb_private_ip_0:
+  vlb_int_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the private network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
-  vlb_private_ip_1:
+  vlb_onap_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components
-  vlb_private_ip_2:
+  vlb_int_pktgen_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the vPacketGen network
     description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen
-  vdns_private_ip_0:
+  vdns_int_private_ip_0:
     type: string
     label: vDNS private IP address towards the private network
     description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
-  vdns_private_ip_1:
+  vdns_onap_private_ip_0:
     type: string
     label: vDNS private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vDNS to communicate with ONAP components
@@ -93,6 +97,10 @@ parameters:
     type: string
     label: VNF ID
     description: The VNF ID is provided by ONAP
+  vnf_name:
+    type: string
+    label: VNF NAME
+    description: The VNF NAME is provided by ONAP
   vf_module_id:
     type: string
     label: vFirewall module ID
@@ -120,13 +128,13 @@ parameters:
   nexus_artifact_repo:
     type: string
     description: Root URL for the Nexus repository for Maven artifacts.
-    default: "https://nexus.onap.org"
+    #default: "https://nexus.onap.org"
   sec_group:
     type: string
     description: ONAP Security Group
-  dns_enabled:
-    type: string
-    description: Enable/disable DNS (by default use true)
+  #dns_enabled:
+  #  type: string
+  #  description: Enable/disable DNS (by default use true)
 
 #############
 #           #
@@ -136,60 +144,64 @@ parameters:
 
 resources:
 
-  random-str:
+  random-str_1:
     type: OS::Heat::RandomString
     properties:
       length: 4
 
-  my_keypair:
+  my_keypair_1:
     type: OS::Nova::KeyPair
     properties:
       name:
         str_replace:
-          template: base_rand
+          template: vnfname_base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }
+            rand: { get_resource: random-str_1 }
+            vnfname: { get_param: vnf_name }
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  vdns_2_private_0_port:
+  vdns_1_int_private_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_param: vlb_private_net_id }
-      fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
+      network: { get_param: int_private_net_id }
+      fixed_ips: [{"subnet": { get_param: int_private_subnet_id }, "ip_address": { get_param: vdns_int_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vdns_2_private_1_port:
+  vdns_1_onap_private_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_onap_private_ip_0 }}]
       security_groups:
       - { get_param: sec_group }
 
-  vdns_2:
+  vdns_server_1:
     type: OS::Nova::Server
     properties:
-      image: { get_param: vlb_image_name }
-      flavor: { get_param: vlb_flavor_name }
+      image: { get_param: vdns_image_name }
+      flavor: { get_param: vdns_flavor_name }
       name: { get_param: vdns_name_0 }
-      key_name: { get_resource: my_keypair }
+      key_name: { get_resource: my_keypair_1 }
       networks:
         - network: { get_param: public_net_id }
-        - port: { get_resource: vdns_2_private_0_port }
-        - port: { get_resource: vdns_2_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
+        - port: { get_resource: vdns_1_int_private_port_0 }
+        - port: { get_resource: vdns_1_onap_private_port_0 }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+        vf_module_id: { get_param: vf_module_id }
+        vnf_name: { get_param: vnf_name }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __lb_oam_int__: { get_param: vlb_private_ip_1 }
-            __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
-            __lb_to_pktgen_if__: { get_param: vlb_private_ip_2}
-            __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
-            __oam_private_ipaddr__: { get_param: vdns_private_ip_1 }
+            __lb_oam_int__: { get_param: vlb_onap_private_ip_0 }
+            __lb_private_ipaddr__: { get_param: vlb_int_private_ip_0 }
+            __lb_to_pktgen_if__: { get_param: vlb_int_pktgen_private_ip_0}
+            __local_private_ipaddr__: { get_param: vdns_int_private_ip_0 }
+            __oam_private_ipaddr__: { get_param: vdns_onap_private_ip_0 }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
@@ -221,4 +233,4 @@ resources:
             unzip -j /opt/vlbms-scripts-__install_script_version__.zip -d /opt v_dns_install.sh
             cd /opt
             chmod +x v_dns_install.sh
-            ./v_dns_install.sh
\ No newline at end of file
+            ./v_dns_install.sh