Updatd after network review 2017-08-03

Change-Id: I29e9610c18f3592fe933c247fd97afb6581ba974
Signed-off-by: Brian Freeman <bf1936@att.com>

2 files changed, 25 insertions, 43 deletions

diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
index 7158192d..4ab63bf7 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
@@ -2,15 +2,15 @@
   vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
   vcpe_flavor_name: 4 GB General Purpose v1
   public_net_id: 00000000-0000-0000-0000-000000000000
-  vgmux_vgw_private_net_id: zdfw1muxgw01_private
-  vgw_private_net_id: zdfw1mux01_private
+  mux_gw_private_net_id: zdfw1muxgw01_private
+  mux_gw_private_subnet_id: zdfw1muxgw01_private
+  cpe_public_net_id: zdfw1cpe01_public
+  cpe_public_subnet_id: zdfw1cpe01_public
   onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
   onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
-  vgw_private_net_cidr: 192.168.30.0/24
   onap_private_net_cidr: 10.0.0.0/8
-  vgw_private_ip_0: 192.168.20.22
-  vgw_private_ip_1: 10.2.30.22
-  vgw_private_ip_2: 192.168.30.22
+  vgw_private_ip_0: 192.168.0.0
+  vgw_private_ip_1: 10.0.101.30
   vgw_name_0: zdcpe11cpe01gw01
   vnf_id: vCPE_Infrastructure_GW_demo_app
   vf_module_id: vCPE_Customer_GW
diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
index c0c0a71f..a2b0856a 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml
@@ -45,10 +45,14 @@ parameters:
     type: string
     label: Public network name or ID
     description: Public network that enables remote connection to VNF
-  vgmux_private_net_id:
+  mux_gw_private_net_id:
     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
@@ -57,10 +61,14 @@ parameters:
     type: string
     label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP components and the VNF
-  vgmux_private_net_cidr:
+  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: vGMUX private network CIDR
-    description: The CIDR of the vGMUX private network
+    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
@@ -68,19 +76,11 @@ parameters:
   vgw_private_ip_0:
     type: string
     label: vGW IN private IP address
-    description: Private IP address that is assigned to the vGW IN
+    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
     description: Private IP address that is assigned to the vGW to communicate with ONAP components
-  vgw_private_ip_2:
-    type: string
-    label: vGW OUT IP address
-    description: Private IP address that is assigned to the vGW OUT 
-  vgmux_private_ip_1:
-    type: string
-    label: vGMUX private IP address towards the vGW 
-    description: Private IP address that is assigned to the vGMUX to communicate with vGWs 
   vgw_name_0:
     type: string
     label: vGW  name
@@ -155,34 +155,16 @@ resources:
       public_key: { get_param: pub_key }
       save_private_key: false
 
-  vgmux_vgw_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: vgmux_vgw_private_net_id }
-  vgmux_vgw_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: { get_param: vgmux_vgw_private_net_id }
-      network_id: { get_resource: vgmux_vgw_private_network }
-      cidr: { get_param: vgmux_vgw_private_net_cidr }
-  vgmux_private_network:
-    type: OS::Neutron::Net
-    properties:
-      name: { get_param: vgmux_private_net_id }
-  vgmux_private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: { get_param: vgmux_private_net_id }
-      network_id: { get_resource: vgmux_private_network }
-      cidr: { get_param: vgmux_private_net_cidr }
 
 
   # Virtual GW Instantiation
+  #   mux_gw_private_net created by mux heat template
+  #   cpe_public_net created by infra heat template (vDNS)
   vgw_private_0_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: vgmux_vgw_private_network }
-      fixed_ips: [{"subnet": { get_resource: vgmux_vgw_private_subnet}, "ip_address": { get_param: vgw_private_ip_0 }}]
+      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:
     type: OS::Neutron::Port
@@ -193,8 +175,8 @@ resources:
   vgmux_private_2_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: vgw_private_network }
-      fixed_ips: [{"subnet": {  get_resource: vgw_private_subnet}, "ip_address": { get_param: vgw_private_ip_2 }}]
+      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:
     type: OS::Nova::Server