Clean up vCPE Heat templates

Change-Id: I1227bb9751cec36cba2ba5e03d6f0ed302fb1489
Signed-off-by: Marco Platania <platania@research.att.com>

9 files changed, 85 insertions, 175 deletions

diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
index 54e74d1e..80e01437 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
@@ -7,11 +7,10 @@ parameters:
   onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   cpe_signal_net_cidr: 10.4.0.0/24
-  onap_private_net_cidr: 10.0.0.0/16
   cpe_public_net_cidr: 10.2.0.0/24
-  vdhcp_private_ip_0: 10.0.4.1
+  vdhcp_private_ip_0: 10.4.0.1
   vdhcp_private_ip_1: 10.0.101.1
-  vaaa_private_ip_0: 10.0.4.2
+  vaaa_private_ip_0: 10.4.0.2
   vaaa_private_ip_1: 10.0.101.2
   vdns_private_ip_0: 10.2.0.1
   vdns_private_ip_1: 10.0.101.3
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
index 914a202b..4c039538 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
@@ -65,17 +65,13 @@ parameters:
     type: string
     label: vAAA private network CIDR
     description: The CIDR of the vAAA private network
-  onap_private_net_cidr:
-    type: string
-    label: ONAP private network CIDR
-    description: The CIDR of the protected private network
   cpe_public_net_cidr:
     type: string
     label: vCPE public network CIDR
     description: The CIDR of the vCPE public 
   vaaa_private_ip_0:
     type: string
-    label: vAAA private IP address towards the private network
+    label: vAAA private IP address towards the CPE_SIGNAL private network
     description: Private IP address that is assigned to the vAAA to communicate with the vCPE components 
   vaaa_private_ip_1:
     type: string
@@ -83,7 +79,7 @@ parameters:
     description: Private IP address that is assigned to the vAAA to communicate with ONAP components
   vdns_private_ip_0:
     type: string
-    label: vDNS private IP address towards the private network
+    label: vDNS private IP address towards the CPE_PUBLIC private network
     description: Private IP address that is assigned to the vDNS to communicate with the vCPE components
   vdns_private_ip_1:
     type: string
@@ -91,7 +87,7 @@ parameters:
     description: Private IP address that is assigned to the vDNS to communicate with ONAP components
   vdhcp_private_ip_0:
     type: string
-    label: vDHCP  private IP address towards the private network
+    label: vDHCP  private IP address towards the CPE_SIGNAL private network
     description: Private IP address that is assigned to the vDHCP to communicate with the vCPE components
   vdhcp_private_ip_1:
     type: string
@@ -99,7 +95,7 @@ parameters:
     description: Private IP address that is assigned to the vDHCP to communicate with ONAP components
   vweb_private_ip_0:
     type: string
-    label: vWEB private IP address towards the vGW 
+    label: vWEB private IP address towards the CPE_PUBLIC private network
     description: Private IP address that is assigned to the vWEB to communicate with the vGWs 
   vweb_private_ip_1:
     type: string
@@ -195,6 +191,7 @@ resources:
     type: OS::Neutron::Net
     properties:
       name: { get_param: cpe_signal_net_id }
+
   cpe_signal_subnet:
     type: OS::Neutron::Subnet
     properties:
@@ -206,6 +203,7 @@ resources:
     type: OS::Neutron::Net
     properties:
       name: { get_param: cpe_public_net_id }
+
   cpe_public_subnet:
     type: OS::Neutron::Subnet
     properties:
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
index 619dec49..ffb2f320 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
@@ -6,12 +6,13 @@
   bng_gmux_private_net_id: zdfw1bngmux01_private
   onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
   onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
+  cpe_signal_net_id: <PUT_YOUR_CPE_SIGNAL_NET_ID_HERE>
   brgemu_bng_private_net_cidr: 10.3.0.0/24
   bng_gmux_private_net_cidr: 10.1.0.0/24
-  onap_private_net_cidr: 10.0.0.0/16
   vbng_private_ip_0: 10.3.0.1
   vbng_private_ip_1: 10.0.101.10
-  vbng_private_ip_2: 10.1.0.10
+  vbng_private_ip_2: 10.4.0.3

+  vbng_private_ip_3: 10.1.0.10
   vbng_name_0: zdcpe1cpe01bng01
   vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app
   vf_module_id: vCPE_Intrastructure_Metro_vBNG
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
index 79b41d91..02351f9c 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE Infrastructue Metro elements (vBNG, vGMUX ) for ONAP
+description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) for ONAP
 
 ##############
 #            #
@@ -69,10 +69,10 @@ parameters:
     type: string
     label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP components and the VNF
-  onap_private_net_cidr:
+  cpe_signal_net_id:
     type: string
-    label: ONAP private network CIDR
-    description: The CIDR of the protected private network
+    label: vCPE private network name or ID
+    description: Private network that connects vCPE elements with vCPE infrastructure elements
   vbng_private_ip_0:
     type: string
     label: vBNG IN private IP address
@@ -83,7 +83,11 @@ parameters:
     description: Private IP address that is assigned to the vBNG to communicate with ONAP components
   vbng_private_ip_2:
     type: string
-    label: vBNG to vGMUX  private IP address
+    label: vBNG to CPE_SIGNAL private IP address
+    description: Private IP address that is assigned to the vBNG in the CPE_SIGNAL network
+  vbng_private_ip_3:
+    type: string
+    label: vBNG to vGMUX private IP address
     description: Private IP address that is assigned to the vBNG to vGMUX port
   vbng_name_0:
     type: string
@@ -163,16 +167,19 @@ resources:
     type: OS::Neutron::Net
     properties:
       name: { get_param: brgemu_bng_private_net_id }
+
   brgemu_bng_in_private_subnet:
     type: OS::Neutron::Subnet
     properties:
       name: { get_param: brgemu_bng_private_net_id }
       network_id: { get_resource: brgemu_bng_private_network }
       cidr: { get_param: brgemu_bng_private_net_cidr }
+
   bng_gmux_private_network:
     type: OS::Neutron::Net
     properties:
       name: { get_param: bng_gmux_private_net_id }
+
   bng_gmux_private_subnet:
     type: OS::Neutron::Subnet
     properties:
@@ -197,8 +204,14 @@ resources:
   vbng_private_2_port:
     type: OS::Neutron::Port
     properties:
+      network: { get_param: cpe_signal_net_id }
+      fixed_ips: [{"subnet": { get_param: cpe_signal_net_id}, "ip_address": { get_param: vbng_private_ip_2 }}]
+
+  vbng_private_3_port:
+    type: OS::Neutron::Port
+    properties:
       network: { get_resource: bng_gmux_private_network }
-      fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet}, "ip_address": { get_param: vbng_private_ip_2 }}]
+      fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet}, "ip_address": { get_param: vbng_private_ip_3 }}]
 
   vbng_0:
     type: OS::Nova::Server
@@ -244,69 +257,3 @@ resources:
             cd /opt
             chmod +x v_bng_install.sh
             ./v_bng_install.sh
-
-
-  # Virtual GMUX Instantiation
-  vgmux_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: vbng_vgmux_private_network }
-      fixed_ips: [{"subnet": { get_resource: vbng_vgmux_private_subnet}, "ip_address": { get_param: vgmux_private_ip_0 }}]
-
-  vgmux_private_1_port:
-    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: vgmux_private_ip_1 }}]
-
-  vgmux_private_2_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: vgmux_private_network }
-      fixed_ips: [{"subnet": {  get_resource: vgmux_private_subnet}, "ip_address": { get_param: vgmux_private_ip_2 }}]
-
-  vgmux_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vcpe_image_name }
-      flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vgmux_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vgmux_private_0_port }
-        - port: { get_resource: vgmux_private_1_port }
-        - port: { get_resource: vgmux_private_2_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __gmux_oam_int__ : { get_param: vgmux_private_ip_1 }
-            __gmux_private_ipaddr__: { get_param: vgmux_private_ip_2 }
-            __local_private_ipaddr__: { get_param: vgmux_private_ip_1 }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir /opt/config
-            echo "__gmux_oam_int__" > /opt/config/gmux_oam_int.txt
-            echo "__gmux_private_ipaddr__" > /opt/config/gmux_private_ipaddr.txt
-            echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-            echo "__install_script_version__" > /opt/config/install_script_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-
-            # Download and run install script
-            curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
-            cd /opt
-            chmod +x v_bng_install.sh
-            ./v_bng_install.sh
-
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
index 475a170c..20e66327 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
@@ -3,6 +3,9 @@
   vcpe_flavor_name: 4 GB General Purpose v1
   public_net_id: 00000000-0000-0000-0000-000000000000
   brgemu_bng_private_net_id: zdfw1brgemubng01_private
+  vbrgemu_private_net_id: zdfw1vbrgemu01_private
+  vbrgemu_private_net_cidr: 192.168.1.0/24
+  vbrgemu_private_ip_1: 192.168.1.2

   vbrgemu_name_0: zdcpe11cpe01brgemu01
   vnf_id: vCPE_Infrastructure_BGREMU_demo_app
   vf_module_id: vCPE_Customer_BRGEMU
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
index bf387fae..8d8f306f 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
@@ -28,7 +28,7 @@ description: Heat template to deploy vCPE vBRG Emulator (vBRGEMU ) for ONAP
 
 #######################################################################
 #                                                                     #
-# PARAMETERS 							      #
+# PARAMETERS 							                                            #
 #                                                                     #
 #     0_port should get IP address from DHCP discover through vBNG    #
 #     DCAE is not monitoring the BRGEMULATOR                          #
@@ -47,27 +47,19 @@ parameters:
     type: string
     label: Public network name or ID
     description: Public network that enables remote connection to VNF
-  brgemu_bng_private_net_id:
+  vbrgemu_bng_private_net_id:
     type: string
     label: vBNG private network name or ID
     description: Private network that connects vBRGEMU to vBNG
-  onap_private_net_id:
+  vbrgemu_private_net_id:
     type: string
-    label: ONAP management network name or ID
-    description: Private network that connects ONAP components and the VNF
-  onap_private_subnet_id:
+    label: vBRGEMU Home private network name or ID
+    description: Private network that connects vBRGEMU to local devices
+  vbrgemu_private_net_cidr:
     type: string
-    label: ONAP management sub-network name or ID
-    description: Private sub-network that connects ONAP components and the VNF
-  brgemu_bng_private_net_cidr:
-    type: string
-    label: BRGEMUL vBNG private network CIDR
-    description: The CIDR of the vBNG private network
-  onap_private_net_cidr:
-    type: string
-    label: ONAP private network CIDR
-    description: The CIDR of the protected private network
-  vbrgemu_private_ip_0:
+    label: vBRGEMU Home private network CIDR
+    description: The CIDR of the input side of vBRGEMU Home private network
+  vbrgemu_private_ip_1:
     type: string
     label: vGW IN private IP address
     description: Private IP address that is assigned to the vBRGEMU (SHOULD NOT BE NEEDED) 
@@ -137,15 +129,30 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
+  vbrgemu_private_network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: vbrgemu_private_net_id }
+
+  vbrgemu_private_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name: { get_param: vbrgemu_private_net_id }
+      network_id: { get_resource: vbrgemu_private_network }
+      cidr: { get_param: vbrgemu_private_net_cidr }
 
   # Virtual BRG Emulator Instantiation
-  #   0_port should get IP address from DHCP discover through vBNG
+  # 0_port should get IP address from DHCP discover through vBNG
   vbrgemu_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_param: brgemu_bng_private_net_id}
-    # fixed_ips: [{"subnet": { get_resource: vbng_vbrgemu_private_subnet}, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
+      network: { get_param: vbrgemu_bng_private_net_id}
 
+  vbrgemu_private_0_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: vbrgemu_private_net_id}
+      fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet}, "ip_address": { get_param: vbrgemu_private_ip_1 }}]
 
   vbrgemu_0:
     type: OS::Nova::Server
@@ -158,7 +165,6 @@ resources:
         - network: { get_param: public_net_id }
         - port: { get_resource: vbrgemu_private_0_port }
         - port: { get_resource: vbrgemu_private_1_port }
-        - port: { get_resource: vbrgemu_private_2_port }
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
@@ -185,4 +191,3 @@ resources:
             cd /opt
             chmod +x v_brgemu_install.sh
             ./v_brgemu_install.sh
-
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env
index e3009f1a..8db88f34 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env
@@ -6,8 +6,7 @@
   mux_gw_private_net_id: zdfw1muxgw01_private
   onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
   onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
-  bng_mux_private_net_cidr: 10.1.0.0/24
-  onap_private_net_cidr: 10.0.0.0/16
+  mux_gw_private_net_cidr: 10.1.0.0/24
   vgmux_private_ip_0: 10.1.0.20
   vgmux_private_ip_1: 10.0.101.20
   vgmux_private_ip_2: 192.168.0.0
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
index 2cc11ba2..715b4a10 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE Infrastructue Metro vGMUX  for ONAP
+description: Heat template to deploy vCPE Infrastructue Metro vGMUX for ONAP
 
 ##############
 #            #
@@ -49,10 +49,6 @@ parameters:
     type: string
     label: vBNG vGMUX private network name or ID
     description: Private network that connects vBNG to vGMUX
-  bng_mux_private_net_cidr:
-    type: string
-    label: vGMUX private network CIDR
-    description: The CIDR of the input side of vGMUX private network
   mux_gw_private_net_id:
     type: string
     label: vCPE Public network name or ID
@@ -73,7 +69,7 @@ parameters:
     type: string
     label: ONAP private network CIDR
     description: The CIDR of the protected private network
-  mux_gw_private_ip_0:
+  vgmux_private_ip_0:
     type: string
     label: vGMUX private IP address towards the private network
     description: Private IP address that is assigned to the vGMUX to communicate with the vBNG
@@ -81,10 +77,6 @@ parameters:
     type: string
     label: vGMUX private IP address towards the ONAP management network
     description: Private IP address that is assigned to the vGMUX to communicate with ONAP components
-  vgmux_private_ip_2:
-    type: string
-    label: vGMUX private IP address towards the ONAP management network
-    description: Private IP address that is assigned to the vGMUX to communicate with vGW  SHOULD NOT BE NEEDED
   vgmux_name_0:
     type: string
     label: vGMUX name
@@ -159,21 +151,11 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  bng_mux_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: bng_mux_private_net_id }
-  bng_mux_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: { get_param: bng_mux_private_net_id }
-      network_id: { get_resource: bng_mux_private_network }
-      cidr: { get_param: bng_mux_private_net_cidr }
-
   mux_gw_private_network:
     type: OS::Neutron::Net
     properties:
       name: { get_param: mux_gw_private_net_id }
+
   mux_gw_private_subnet:
     type: OS::Neutron::Subnet
     properties:
@@ -183,23 +165,23 @@ resources:
 
 
   # Virtual GMUX Instantiation
-  mux_gw_private_0_port:
+  vgmux_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: bng_mux_private_network }
-      fixed_ips: [{"subnet": { get_resource: bng_mux_private_subnet}, "ip_address": { get_param: mux_gw_private_ip_0 }}]
+      network: { get_param: bng_mux_private_network }
+      fixed_ips: [{"subnet": { get_param: bng_mux_private_net_id}, "ip_address": { get_param: vgmux_private_ip_0 }}]
 
-  mux_gw_private_1_port:
+  vgmux_private_1_port:
     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: mux_gw_private_ip_1 }}]
+      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_1 }}]
 
-  mux_gw_private_2_port:
+  vgmux_private_2_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: mux_gw_private_network }
-      fixed_ips: [{"subnet": {  get_resource: mux_gw_private_subnet}, "ip_address": { get_param: mux_gw_private_ip_2 }}]
+      #fixed_ips: [{"subnet": {  get_resource: mux_gw_private_subnet}, "ip_address": { get_param: mux_gw_private_ip_2 }}]
 
   vgmux_0:
     type: OS::Nova::Server
@@ -210,17 +192,17 @@ resources:
       key_name: { get_resource: my_keypair }
       networks:
         - network: { get_param: public_net_id }
-        - port: { get_resource: mux_gw_private_0_port }
-        - port: { get_resource: mux_gw_private_1_port }
-        - port: { get_resource: mux_gw_private_2_port }
+        - port: { get_resource: vgmux_private_0_port }
+        - port: { get_resource: vgmux_private_1_port }
+        - port: { get_resource: vgmux_private_2_port }
       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __gmux_oam_int__ : { get_param: mux_gw_private_ip_1 }
-            __gmux_private_ipaddr__: { get_param: mux_gw_private_ip_2 }
-            __local_private_ipaddr__: { get_param: mux_gw_private_ip_1 }
+            __gmux_oam_int__ : { get_param: vgmux_private_ip_1 }
+            #__gmux_private_ipaddr__: { get_param: vgmux_private_ip_2 }
+            __local_private_ipaddr__: { get_param: vgmux_private_ip_0 }
             __repo_url_blob__ : { get_param: repo_url_blob }
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }
diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
index a2b0856a..d7b0af86 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE vGateway (vG ) for ONAP
+description: Heat template to deploy vCPE vGateway (vG) for ONAP
 
 ##############
 #            #
@@ -49,34 +49,14 @@ parameters:
     type: string
     label: vGMUX private network name or ID
     description: Private network that connects vGMUX to vGWs
-  mux_gw_private_subnet_id:
-    type: string
-    label: vGMUX private sub-network name or ID
-    description: Private sub-network that connects vGMUX to vGWs (IS THIS NEEDED ?) 
   onap_private_net_id:
     type: string
     label: ONAP management network name or ID
     description: Private network that connects ONAP components and the VNF
-  onap_private_subnet_id:
-    type: string
-    label: ONAP management sub-network name or ID
-    description: Private sub-network that connects ONAP components and the VNF
   cpe_public_net_id:
     type: string
     label: vCPE network that emulates internetmanagement name or ID
     description: Private network that connects vGW to emulated internet 
-  cpe_public_subnet_id:
-    type: string
-    label: vCPE sub-network that emulates internetmanagement name or ID
-    description: Private network that connects vGW to emulated internet 
-  onap_private_net_cidr:
-    type: string
-    label: ONAP private network CIDR
-    description: The CIDR of the protected private network
-  vgw_private_ip_0:
-    type: string
-    label: vGW IN private IP address
-    description: Private IP address that is assigned to the vGW IN (SHOULD NOT BE NEEDED)
   vgw_private_ip_1:
     type: string
     label: vGW private IP address towards the ONAP management network
@@ -155,8 +135,6 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
-
-
   # Virtual GW Instantiation
   #   mux_gw_private_net created by mux heat template
   #   cpe_public_net created by infra heat template (vDNS)
@@ -164,26 +142,24 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: { get_param: mux_gw_private_net_id}
-  #    fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id}, "ip_address": { get_param: vgw_private_ip_0 }}]
 
-  vgmux_private_1_port:
+  vgw_private_1_port:
     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: vgw_private_ip_1 }}]
 
-  vgmux_private_2_port:
+  vgw_private_2_port:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cpe_public_net_id}
-  #fixed_ips: [{"subnet": {  get_param: cpe_public_subnet_id}, "ip_address": { get_param: vgw_private_ip_2 }}]
 
-  vgmux_0:
+  vgw_0:
     type: OS::Nova::Server
     properties:
       image: { get_param: vcpe_image_name }
       flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vgmux_name_0 }
+      name: { get_param: vgw_name_0 }
       key_name: { get_resource: my_keypair }
       networks:
         - network: { get_param: public_net_id }
@@ -195,9 +171,9 @@ resources:
       user_data:
         str_replace:
           params:
-            __gmux_oam_int__ : { get_param: vgw_private_ip_1 }
-            __gmux_private_ipaddr__: { get_param: vgw_private_ip_2 }
-            __local_private_ipaddr__: { get_param: vgw_private_ip_1 }
+            #__gmux_oam_int__ : { get_param: vgw_private_ip_1 }
+            #__gmux_private_ipaddr__: { get_param: vgw_private_ip_2 }
+            #__local_private_ipaddr__: { get_param: vgw_private_ip_1 }
             __repo_url_blob__ : { get_param: repo_url_blob }
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }