Take out private networks from vCPE Heat templates

- Take out shared networks (use network templates in SO)
- Remove rackspace from templates name
- Modify MANIFEST files accordingly

Change-Id: I43f778eff74cf525b5ad7628ccdc38dfab7d0ef4
Issue-ID: UCA-32
Signed-off-by: Marco Platania <platania@research.att.com>

3 files changed, 28 insertions, 24 deletions

diff --git a/heat/vCPE/vbng/MANIFEST.json b/heat/vCPE/vbng/MANIFEST.json
index f4fbb305..0b34111e 100644
--- a/heat/vCPE/vbng/MANIFEST.json
+++ b/heat/vCPE/vbng/MANIFEST.json
@@ -3,12 +3,12 @@
     "description": "", 
     "data": [
         {
-            "file": "base_vcpe_vbng_rackspace.yaml", 
+            "file": "base_vcpe_vbng.yaml", 
             "type": "HEAT", 
             "isBase": "true", 
             "data": [
                 {
-                    "file": "base_vcpe_vbng_rackspace.env", 
+                    "file": "base_vcpe_vbng.env", 
                     "type": "HEAT_ENV"
                 }
             ]
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index cc391c49..f79d306e 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -1,13 +1,16 @@
  parameters:
-  vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-  vcpe_flavor_name: 4 GB General Purpose v1
-  public_net_id: 00000000-0000-0000-0000-000000000000
+  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
+  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
+  public_net_id: PUT THE PUBLIC NETWORK ID HERE
   brgemu_bng_private_net_id: zdfw1bngin01_private
+  brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private
   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>
+  bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private
+  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE
   onap_private_net_cidr: 10.0.0.0/16
   cpe_signal_net_id: zdfw1cpe01_private
+  cpe_signal_subnet_id: zdfw1cpe01_sub_private
   brgemu_bng_private_net_cidr: 10.3.0.0/24
   bng_gmux_private_net_cidr: 10.1.0.0/24
   cpe_signal_private_net_cidr: 10.4.0.0/24
@@ -26,7 +29,7 @@
   install_script_version: 1.1.0-SNAPSHOT
   key_name: vbng_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
-  cloud_env: rackspace
+  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
   vpp_source_repo_url: https://gerrit.fd.io/r/vpp
   vpp_source_repo_branch: stable/1704
   vpp_patch_url: https://gerrit.onap.org/r/#/c/11083/5/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml
index 8a49e171..9cc44840 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -24,7 +24,7 @@
 
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG) for ONAP
+description: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG)
 
 ##############
 #            #
@@ -49,6 +49,10 @@ parameters:
     type: string
     label: vBNG IN private network name or ID
     description: Private network that connects vBRG to vBNG
+  brgemu_bng_private_subnet_id:
+    type: string
+    label: vBNG IN private sub-network name or ID
+    description: vBNG IN private sub-network name or ID
   brgemu_bng_private_net_cidr:
     type: string
     label: vBNG IN private network CIDR
@@ -57,6 +61,10 @@ parameters:
     type: string
     label: vBNG vGMUX private network name or ID
     description: Private network that connects vBNG to vGMUX
+  bng_gmux_private_subnet_id:
+    type: string
+    label: vBNG vGMUX private sub-network name or ID
+    description: vBNG vGMUX private sub-network name or ID
   bng_gmux_private_net_cidr:
     type: string
     label: vGMUX private network CIDR
@@ -77,6 +85,10 @@ parameters:
     type: string
     label: vCPE private network name or ID
     description: Private network that connects vCPE elements with vCPE infrastructure elements
+  cpe_signal_subnet_id:
+    type: string
+    label: vCPE private sub-network name or ID
+    description: vCPE private sub-network name or ID
   cpe_signal_private_net_cidr:
     type: string
     label: vAAA private network CIDR
@@ -183,24 +195,13 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  brgemu_bng_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: brgemu_bng_private_net_id }
-
-  brgemu_bng_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 }
 
   # Virtual BNG Instantiation
   vbng_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: brgemu_bng_private_network }
-      fixed_ips: [{"subnet": { get_resource: brgemu_bng_private_subnet }, "ip_address": { get_param: vbng_private_ip_0 }}]
+      network: { get_param: brgemu_bng_private_net_id }
+      fixed_ips: [{"subnet": { get_param: brgemu_bng_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_0 }}]
 
   vbng_private_1_port:
     type: OS::Neutron::Port
@@ -212,13 +213,13 @@ resources:
     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 }}]
+      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vbng_private_ip_2 }}]
 
   vbng_private_3_port:
     type: OS::Neutron::Port
     properties:
       network: { get_param: bng_gmux_private_net_id }
-      fixed_ips: [{"subnet": { get_param: bng_gmux_private_net_id }, "ip_address": { get_param: vbng_private_ip_3 }}]
+      fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_3 }}]
 
   vbng_0:
     type: OS::Nova::Server