summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--heat/vCPE/infra/base_vcpe_infra_rackspace.env20
-rw-r--r--heat/vCPE/infra/base_vcpe_infra_rackspace.yaml47
-rw-r--r--heat/vCPE/vbng/MANIFEST.json (renamed from heat/vCPE/metro/MANIFEST.json)6
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng_rackspace.env (renamed from heat/vCPE/metro/base_vcpe_metro_rackspace.env)24
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml (renamed from heat/vCPE/metro/base_vcpe_metro_rackspace.yaml)87
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env14
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml93
-rw-r--r--heat/vCPE/vgmux/MANIFEST.json17
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env25
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml248
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw_rackspace.env12
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml56
-rw-r--r--tutorials/VoLTE/l3-dci-connection.json13
13 files changed, 433 insertions, 229 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
index 48c59259..2ec1a0b8 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
@@ -2,17 +2,19 @@ parameters:
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
- vaaa_private_net_id: zdfw1aaa01_private
+ cpe_signal_net_id: zdfw1cpe01_private
+ cpe_public_net_id: zdfw1cpe01_public
onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- vaaa_private_net_cidr: 192.168.20.0/24
- onap_private_net_cidr: 10.0.0.0/8
- vaaa_private_ip_0: 192.168.20.121
- vaaa_private_ip_1: 10.1.20.4
- vdns_private_ip_0: 192.168.20.122
- vdns_private_ip_1: 10.1.20.5
- vdhcp_private_ip_0: 192.168.20.123
- vdhcp_private_ip_1: 10.1.20.6
+ 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_1: 10.0.101.1
+ vaaa_private_ip_0: 10.0.4.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
vaaa_name_0: zdcpe1cpe01aaa01
vdns_name_0: zdcpe11cpe01dns01
vdhcp_name_0: zdcpe1cpe01dhcp01
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
index 16ea1cf0..14e82500 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
@@ -45,7 +45,7 @@ parameters:
type: string
label: Public network name or ID
description: Public network that enables remote connection to VNF
- vaaa_private_net_id:
+ cpe_signal_net_id:
type: string
label: vAAA private network name or ID
description: Private network that connects vAAA with vDNSs
@@ -53,11 +53,15 @@ parameters:
type: string
label: ONAP management network name or ID
description: Private network that connects ONAP components and the VNF
+ cpe_public_net_id:
+ type: string
+ label: vCPE Public network (emulates internet) name or ID
+ description: Private network that connects vGW to emulated internet
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
- vaaa_private_net_cidr:
+ cpe_signal_net_cidr:
type: string
label: vAAA private network CIDR
description: The CIDR of the vAAA private network
@@ -65,6 +69,10 @@ parameters:
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
@@ -171,24 +179,35 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- vaaa_private_network:
+ cpe_signal_network:
type: OS::Neutron::Net
properties:
- name: { get_param: vaaa_private_net_id }
+ name: { get_param: cpe_signal_net_id }
+ cpe_signal_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name: { get_param: cpe_signal_net_id }
+ network_id: { get_resource: cpe_signal_network }
+ cidr: { get_param: cpe_signal_net_cidr }
- vaaa_private_subnet:
+ cpe_public_network:
+ type: OS::Neutron::Net
+ properties:
+ name: { get_param: cpe_public_net_id }
+ cpe_public_subnet:
type: OS::Neutron::Subnet
properties:
- name: { get_param: vaaa_private_net_id }
- network_id: { get_resource: vaaa_private_network }
- cidr: { get_param: vaaa_private_net_cidr }
+ name: { get_param: cpe_public_net_id }
+ network_id: { get_resource: cpe_public_network }
+ cidr: { get_param: cpe_public_net_cidr }
+
# Virtual Load Balancer Instantiation
vaaa_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: vaaa_private_network }
- fixed_ips: [{"subnet": { get_resource: vaaa_private_subnet }, "ip_address": { get_param: vaaa_private_ip_0 }}]
+ network: { get_resource: cpe_signal_network }
+ fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vaaa_private_ip_0 }}]
vaaa_private_1_port:
type: OS::Neutron::Port
@@ -245,8 +264,8 @@ resources:
vdns_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: vaaa_private_network }
- fixed_ips: [{"subnet": { get_resource: vaaa_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
+ network: { get_resource: cpe_public_network }
+ fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
vdns_private_1_port:
type: OS::Neutron::Port
@@ -303,8 +322,8 @@ resources:
vdhcp_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: vaaa_private_network }
- fixed_ips: [{"subnet": { get_resource: vaaa_private_subnet }, "ip_address": { get_param: vdhcp_private_ip_0 }}]
+ network: { get_resource: cpe_signal_network }
+ fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vdhcp_private_ip_0 }}]
vdhcp_private_1_port:
type: OS::Neutron::Port
diff --git a/heat/vCPE/metro/MANIFEST.json b/heat/vCPE/vbng/MANIFEST.json
index af791e49..f4fbb305 100644
--- a/heat/vCPE/metro/MANIFEST.json
+++ b/heat/vCPE/vbng/MANIFEST.json
@@ -3,15 +3,15 @@
"description": "",
"data": [
{
- "file": "base_vcpe_metro_rackspace.yaml",
+ "file": "base_vcpe_vbng_rackspace.yaml",
"type": "HEAT",
"isBase": "true",
"data": [
{
- "file": "base_vcpe_metro_rackspace.env",
+ "file": "base_vcpe_vbng_rackspace.env",
"type": "HEAT_ENV"
}
]
}
]
-} \ No newline at end of file
+}
diff --git a/heat/vCPE/metro/base_vcpe_metro_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
index e5c5f33f..2cf43259 100644
--- a/heat/vCPE/metro/base_vcpe_metro_rackspace.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
@@ -2,25 +2,19 @@
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_in_private_net_id: zdfw1bngin01_private
- vbng_vgmux_private_net_id: zdfw1bngmux01_private
- vgmux_private_net_id: zdfw1mux01_private
+ brgemu_bng_private_net_id: zdfw1bngin01_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>
- vbng_in_private_net_cidr: 192.168.10.0/24
- vbng_vgmux_private_net_cidr: 192.168.20.0/24
- vgmux_private_net_cidr: 192.168.30.0/24
+ 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/8
- vbng_private_ip_0: 192.168.10.2
- vbng_private_ip_1: 10.2.30.13
- vbng_private_ip_2: 192.168.20.3
- vgmux_private_ip_0: 192.168.20.2
- vgmux_private_ip_1: 10.2.30.12
- vgmux_private_ip_2: 192.168.30.2
+ 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_name_0: zdcpe1cpe01bng01
- vgmux_name_0: zdcpe11cpe01mux01
- vnf_id: vCPE_Infrastructure_Metro_demo_app
- vf_module_id: vCPE_Intrastructure_Metro
+ vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app
+ vf_module_id: vCPE_Intrastructure_Metro_vBNG
dcae_collector_ip: 10.0.4.102
dcae_collector_port: 8080
repo_url_blob: https://nexus.onap.org/content/sites/raw
diff --git a/heat/vCPE/metro/base_vcpe_metro_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
index ab7f1488..efd2055d 100644
--- a/heat/vCPE/metro/base_vcpe_metro_rackspace.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
@@ -45,26 +45,22 @@ parameters:
type: string
label: Public network name or ID
description: Public network that enables remote connection to VNF
- vbng_in_private_net_id:
+ brgemu_bng_private_net_id:
type: string
label: vBNG IN private network name or ID
description: Private network that connects vBRG to vBNG
- vbng_in_private_net_cidr:
+ brgemu_bng_private_net_cidr:
type: string
label: vBNG IN private network CIDR
description: The CIDR of the input side of vBNG private network
- vbng_vgmux_private_net_id:
+ bng_gmux_private_net_id:
type: string
label: vBNG vGMUX private network name or ID
description: Private network that connects vBNG to vGMUX
- vbng_vgmux_private_net_cidr:
+ bng_gmux_private_net_cidr:
type: string
label: vGMUX private network CIDR
description: The CIDR of the input side of vGMUX private network
- vgmux_private_net_id:
- type: string
- label: vGMUX private network name or ID
- description: Private network that connects vGMUX to vGWs
onap_private_net_id:
type: string
label: ONAP management network name or ID
@@ -73,10 +69,6 @@ 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:
- type: string
- label: vGMUX private network CIDR
- description: The CIDR of the vGMUX private network
onap_private_net_cidr:
type: string
label: ONAP private network CIDR
@@ -93,26 +85,10 @@ parameters:
type: string
label: vBNG to vGMUX private IP address
description: Private IP address that is assigned to the vBNG to vGMUX port
- 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 vCPE components
- vgmux_private_ip_1:
- 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 ONAP components
vbng_name_0:
type: string
label: vBNG name
description: Name of the vBNG
- vgmux_name_0:
- type: string
- label: vGMUX name
- description: Name of the vGMUX
vnf_id:
type: string
label: VNF ID
@@ -183,44 +159,34 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- vbng_in_private_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vbng_in_private_net_id }
- vbng_in_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vbng_in_private_net_id }
- network_id: { get_resource: vbng_in_private_network }
- cidr: { get_param: vbng_in_private_net_cidr }
- vbng_vgmux_private_network:
+ brgemu_bng_private_network:
type: OS::Neutron::Net
properties:
- name: { get_param: vbng_vgmux_private_net_id }
- vbng_vgmux_private_subnet:
+ name: { get_param: brgemu_bng_private_net_id }
+ brgemu_bng_in_private_subnet:
type: OS::Neutron::Subnet
properties:
- name: { get_param: vbng_vgmux_private_net_id }
- network_id: { get_resource: vbng_vgmux_private_network }
- cidr: { get_param: vbng_vgmux_private_net_cidr }
- vgmux_private_network:
+ 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: vgmux_private_net_id }
- vgmux_private_subnet:
+ name: { get_param: bng_gmux_private_net_id }
+ bng_gmux_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 }
+ name: { get_param: bng_gmux_private_net_id }
+ network_id: { get_resource: bng_gmux_private_network }
+ cidr: { get_param: bng_gmux_private_net_cidr }
# Virtual BNG Instantiation
vbng_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: vbng_in_private_network }
- fixed_ips: [{"subnet": { get_resource: vbng_in_private_subnet}, "ip_address": { get_param: vbng_private_ip_0 }}]
+ network: { get_resource: brgemu_bng_private_network }
+ fixed_ips: [{"subnet": { get_resource: brgemu_bng_private_subnet}, "ip_address": { get_param: vbng_private_ip_0 }}]
vbng_private_1_port:
type: OS::Neutron::Port
@@ -231,8 +197,8 @@ resources:
vbng_private_2_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: vbng_private_ip_2 }}]
+ network: { get_resource: bng_gmux_private_network }
+ fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet}, "ip_address": { get_param: vbng_private_ip_2 }}]
vbng_0:
type: OS::Nova::Server
@@ -274,10 +240,10 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vbng/__install_script_version__/v_aaa_install.sh -o /opt/v_aaa_install.sh
+ curl -k __repo_url_blob__/org.onap.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
cd /opt
- chmod +x v_aaa_install.sh
- ./v_aaa_install.sh
+ chmod +x v_bng_install.sh
+ ./v_bng_install.sh
# Virtual GMUX Instantiation
@@ -340,7 +306,10 @@ resources:
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vgmux/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+=======
+ curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
+>>>>>>> 12724d7... Updatd after network review 2017-08-03:heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
cd /opt
- chmod +x v_dns_install.sh
- ./v_dns_install.sh
+ 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 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
diff --git a/heat/vCPE/vgmux/MANIFEST.json b/heat/vCPE/vgmux/MANIFEST.json
new file mode 100644
index 00000000..35603f9a
--- /dev/null
+++ b/heat/vCPE/vgmux/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+ "name": "",
+ "description": "",
+ "data": [
+ {
+ "file": "base_vcpe_vgmux_rackspace.yaml",
+ "type": "HEAT",
+ "isBase": "true",
+ "data": [
+ {
+ "file": "base_vcpe_vgmux_rackspace.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ }
+ ]
+}
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env
new file mode 100644
index 00000000..7ad5b55b
--- /dev/null
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env
@@ -0,0 +1,25 @@
+ parameters:
+ 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
+ bng_mux_private_net_id: zdfw1bngmux01_private
+ 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
+ vgmux_private_ip_0: 10.1.0.20
+ vgmux_private_ip_1: 10.0.101.20
+ vgmux_private_ip_2: 192.168.0.0
+ vgmux_name_0: zdcpe11cpe01mux01
+ vnf_id: vCPE_Infrastructure_vGMUX_demo_app
+ vf_module_id: vCPE_Intrastructure_Metro_vGMUX
+ 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
+ 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
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
new file mode 100644
index 00000000..2cc11ba2
--- /dev/null
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml
@@ -0,0 +1,248 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
+heat_template_version: 2013-05-23
+
+description: Heat template to deploy vCPE Infrastructue Metro vGMUX for ONAP
+
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
+parameters:
+ vcpe_image_name:
+ type: string
+ label: Image name or ID
+ description: Image to be used for compute instance
+ vcpe_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
+ description: Public network that enables remote connection to VNF
+ bng_mux_private_net_id:
+ 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
+ description: Private network that connects vGMUX to vGWs
+ mux_gw_private_net_cidr:
+ type: string
+ label: vGMUX private network CIDR
+ description: The CIDR of the vGMUX private network (should not be 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
+ onap_private_net_cidr:
+ type: string
+ label: ONAP private network CIDR
+ description: The CIDR of the protected private network
+ mux_gw_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
+ vgmux_private_ip_1:
+ 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
+ description: Name of the vGMUX
+ vnf_id:
+ type: string
+ label: VNF ID
+ description: The VNF ID is provided by ONAP
+ vf_module_id:
+ 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
+ description: Public/Private key pair name
+ pub_key:
+ type: string
+ label: Public key
+ description: Public key to be installed on the compute instance
+ repo_url_blob:
+ type: string
+ label: Repository URL
+ description: URL of the repository that hosts the demo packages
+ repo_url_artifacts:
+ type: string
+ label: Repository URL
+ description: URL of the repository that hosts the demo packages
+ install_script_version:
+ type: string
+ label: Installation script version number
+ description: Version number of the scripts that install the vFW demo app
+ demo_artifacts_version:
+ type: string
+ label: Artifacts version used in demo vnfs
+ description: Artifacts (jar, tar.gz) version used in demo vnfs
+ cloud_env:
+ type: string
+ label: Cloud environment
+ description: Cloud environment (e.g., openstack, rackspace)
+
+#############
+# #
+# RESOURCES #
+# #
+#############
+
+resources:
+
+ random-str:
+ type: OS::Heat::RandomString
+ properties:
+ length: 4
+
+ my_keypair:
+ type: OS::Nova::KeyPair
+ properties:
+ name:
+ str_replace:
+ template: base_rand
+ params:
+ base: { get_param: key_name }
+ rand: { get_resource: random-str }
+ 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:
+ name: { get_param: mux_gw_private_net_id }
+ network_id: { get_resource: mux_gw_private_network }
+ cidr: { get_param: mux_gw_private_net_cidr }
+
+
+ # Virtual GMUX Instantiation
+ mux_gw_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 }}]
+
+ mux_gw_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 }}]
+
+ mux_gw_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 }}]
+
+ 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: mux_gw_private_0_port }
+ - port: { get_resource: mux_gw_private_1_port }
+ - port: { get_resource: mux_gw_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 }
+ __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/vgmux/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
+ cd /opt
+ chmod +x v_dns_install.sh
+ ./v_dns_install.sh
+
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
diff --git a/tutorials/VoLTE/l3-dci-connection.json b/tutorials/VoLTE/l3-dci-connection.json
new file mode 100644
index 00000000..ef8f6892
--- /dev/null
+++ b/tutorials/VoLTE/l3-dci-connection.json
@@ -0,0 +1,13 @@
+{
+ "l3-dci-connect": {
+ "id": "${device.id}",
+ "name": "${device.name}",
+ "description": "${device.description}",
+ "router_id": "${device.router_id}",
+ "local_subnets": ["${device.local_subnets}"],
+ "local_network_all":false,
+ "evpn_irts": ["${device.evpn_irts}"],
+ "evpn_erts": ["${device.evpn_erts}"],
+ "l3_vni": "${device.wan.l3_vni}"
+ }
+}