summaryrefslogtreecommitdiffstats
path: root/heat/vCPE/vbrgemu
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2017-08-03 14:57:57 -0500
committerBrian Freeman <bf1936@att.com>2017-08-03 16:23:03 -0500
commit0f0a35c8b21465e2c9c6fd6fe58dd054b49bfcb6 (patch)
treed5daf7b4188b6911f03eacc5824bfd9c7b937050 /heat/vCPE/vbrgemu
parent572472c6c2d9f2a279008fa11f68f8176ba55ac7 (diff)
Updatd after network review 2017-08-03
Change-Id: I29e9610c18f3592fe933c247fd97afb6581ba974 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'heat/vCPE/vbrgemu')
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env14
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml93
2 files changed, 21 insertions, 86 deletions
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
index 1983fab8..ea05e090 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
@@ -2,20 +2,10 @@
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
- vbng_vbrgemu_private_net_id: zdfw1brgemubng01_private
- vbrgemu_private_net_id: zdfw1bng01_private
- onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
- onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
- vbrgemu_private_net_cidr: 192.168.10.0/24
- onap_private_net_cidr: 10.0.0.0/8
- vbrgemu_private_ip_0: 192.168.10.22
- vbrgemu_private_ip_1: 10.2.20.22
- vbrgemu_private_ip_2: 192.168.10.22
- vbrgemu_name_0: zdcpe11cpe01gw01
+ brgemu_bng_private_net_id: zdfw1brgemubng01_private
+ vbrgemu_name_0: zdcpe11cpe01brgemu01
vnf_id: vCPE_Infrastructure_BGREMU_demo_app
vf_module_id: vCPE_Customer_BRGEMU
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.1.0
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
index e1b9ba03..bf387fae 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
@@ -24,13 +24,15 @@
heat_template_version: 2013-05-23
-description: Heat template to deploy vCPE vGateway (vG ) for ONAP
+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 #
+#######################################################################
parameters:
vcpe_image_name:
@@ -45,10 +47,10 @@ parameters:
type: string
label: Public network name or ID
description: Public network that enables remote connection to VNF
- vbng_private_net_id:
+ brgemu_bng_private_net_id:
type: string
- label: vGMUX private network name or ID
- description: Private network that connects vGMUX to vGWs
+ label: vBNG private network name or ID
+ description: Private network that connects vBRGEMU to vBNG
onap_private_net_id:
type: string
label: ONAP management network name or ID
@@ -57,10 +59,10 @@ parameters:
type: string
label: ONAP management sub-network name or ID
description: Private sub-network that connects ONAP components and the VNF
- vbng_private_net_cidr:
+ brgemu_bng_private_net_cidr:
type: string
- label: vGMUX private network CIDR
- description: The CIDR of the vGMUX private network
+ 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
@@ -68,19 +70,7 @@ parameters:
vbrgemu_private_ip_0:
type: string
label: vGW IN private IP address
- description: Private IP address that is assigned to the vGW IN
- vbrgemu_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
- vbrgemu_private_ip_2:
- type: string
- label: vGW OUT IP address
- description: Private IP address that is assigned to the vGW OUT
- vbng_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
+ description: Private IP address that is assigned to the vBRGEMU (SHOULD NOT BE NEEDED)
vbrgemu_name_0:
type: string
label: vGW name
@@ -93,14 +83,6 @@ parameters:
type: string
label: vCPE module ID
description: The vCPE Module ID is provided by ONAP
- dcae_collector_ip:
- type: string
- label: DCAE collector IP address
- description: IP address of the DCAE collector
- dcae_collector_port:
- type: string
- label: DCAE collector port
- description: Port of the DCAE collector
key_name:
type: string
label: Key pair name
@@ -155,46 +137,15 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- vbng_vbrgemu_private_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vbng_vbrgemu_private_net_id }
- vbng_vbrgemu_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vbng_vbrgemu_private_net_id }
- network_id: { get_resource: vbng_vbrgemu_private_network }
- cidr: { get_param: vbng_vbrgemu_private_net_cidr }
- vbng_private_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vbng_private_net_id }
- vbng_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vbng_private_net_id }
- network_id: { get_resource: vbng_private_network }
- cidr: { get_param: vbng_private_net_cidr }
-
- # Virtual GW Instantiation
+ # Virtual BRG Emulator Instantiation
+ # 0_port should get IP address from DHCP discover through vBNG
vbrgemu_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: vbng_vbrgemu_private_network }
- fixed_ips: [{"subnet": { get_resource: vbng_vbrgemu_private_subnet}, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
+ 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 }}]
- vbng_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: vbrgemu_private_ip_1 }}]
-
- vbng_private_2_port:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: vbrgemu_private_network }
- fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet}, "ip_address": { get_param: vbrgemu_private_ip_2 }}]
vbrgemu_0:
type: OS::Nova::Server
@@ -213,9 +164,6 @@ resources:
user_data:
str_replace:
params:
- __brgemu_oam_int__ : { get_param: vbrgemu_private_ip_1 }
- __brgemu_private_ipaddr__: { get_param: vbrgemu_private_ip_2 }
- __local_private_ipaddr__: { get_param: vbrgemu_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 }
@@ -226,9 +174,6 @@ resources:
# Create configuration files
mkdir /opt/config
- echo "__brgemu_oam_int__" > /opt/config/brgemu_oam_int.txt
- echo "__brgemu_private_ipaddr__" > /opt/config/brgemu_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