summaryrefslogtreecommitdiffstats
path: root/heat/vCPE
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vCPE')
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.env1
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.yaml6
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.env2
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.yaml16
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.env2
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.yaml12
6 files changed, 37 insertions, 2 deletions
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index be4f9728..43ccc514 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -21,6 +21,7 @@
vbng_name_0: zdcpe1cpe01bng01
vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app
vf_module_id: vCPE_Intrastructure_Metro_vBNG
+ sdnc_ip_addr: 10.0.7.1
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/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml
index 3dd7ca09..b2ae4e6f 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -169,6 +169,10 @@ parameters:
type: string
label: VPP Patch URL
description: URL for VPP patch for vBNG
+ sdnc_ip_addr:
+ type: string
+ label: SDNC IP address
+ description: IP address of the SDNC
#############
# #
@@ -257,6 +261,7 @@ resources:
__vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
__vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }
__vpp_patch_url__ : { get_param: vpp_patch_url }
+ __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
template: |
#!/bin/bash
@@ -280,6 +285,7 @@ resources:
echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt
echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt
echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt
+ echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index e81afa70..4b486a8d 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -11,12 +11,14 @@
onap_private_net_cidr: 10.0.0.0/16
bng_gmux_private_net_cidr: 10.1.0.0/24
mux_gw_private_net_cidr: 10.5.0.0/24
+ brgemu_bng_private_net_cidr: 10.3.0.0/24
vgmux_private_ip_0: 10.1.0.20
vgmux_private_ip_1: 10.0.101.20
vgmux_private_ip_2: 10.5.0.20
vgmux_name_0: zdcpe1cpe01mux01
vnf_id: vCPE_Infrastructure_vGMUX_demo_app
vf_module_id: vCPE_Intrastructure_Metro_vGMUX
+ bng_gmux_private_ip: 10.1.0.10
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/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index ecdb1b1b..43bbb986 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -69,6 +69,10 @@ parameters:
type: string
label: vGMUX private network CIDR
description: The CIDR of the vGMUX private network
+ brgemu_bng_private_net_cidr:
+ type: string
+ label: vBRG vBNG private network CIDR
+ description: The CIDR of the vBRG-vBNG private network
onap_private_net_id:
type: string
label: ONAP management network name or ID
@@ -105,6 +109,10 @@ parameters:
type: string
label: vCPE module ID
description: The vCPE Module ID is provided by ONAP
+ bng_gmux_private_ip:
+ type: string
+ label: vBNG private IP address towards the vBNG-vGMUX private network
+ description: Private IP address that is assigned to the vBNG to communicate with the vGMUX
dcae_collector_ip:
type: string
label: DCAE collector IP address
@@ -232,12 +240,14 @@ resources:
user_data:
str_replace:
params:
- __bng_mux_net_ipaddr__ : { get_param: vgmux_private_ip_0 }
+ __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 }
__oam_ipaddr__ : { get_param: vgmux_private_ip_1 }
__mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 }
+ __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip }
__bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr }
__oam_cidr__ : { get_param: onap_private_net_cidr }
__mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr }
+ __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr }
__repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
@@ -255,12 +265,14 @@ resources:
# Create configuration files
mkdir /opt/config
- echo "__bng_mux_net_ipaddr__" > /opt/config/bng_mux_net_ipaddr.txt
+ echo "__mux_to_bng_net_ipaddr__" > /opt/config/mux_to_bng_net_ipaddr.txt
echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
echo "__mux_gw_net_ipaddr__" > /opt/config/mux_gw_net_ipaddr.txt
+ echo "__bng_to_mux_ipaddr__ " > /opt/config/bng_to_mux_net_ipaddr.txt
echo "__bng_mux_net_cidr__" > /opt/config/bng_mux_net_cidr.txt
echo "__oam_cidr__" > /opt/config/oam_cidr.txt
echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_net_cidr.txt
+ echo "__brg_bng_net_cidr__" > /opt/config/brg_bng_net_cidr.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/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index f1cadb83..6f33138e 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -17,6 +17,8 @@
vgw_name_0: zdcpe1cpe01gw01
vnf_id: vCPE_Infrastructure_GW_demo_app
vf_module_id: vCPE_Customer_GW
+ mux_ip_addr: 10.5.0.20
+ vg_vgmux_tunnel_vni: 100
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/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml
index 173ba6dd..c4b98760 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml
@@ -157,6 +157,14 @@ parameters:
type: string
label: Honeycomb Source Git Branch
description: Git Branch for the Honeycomb source codes
+ mux_ip_addr:
+ type: string
+ label: vGMUX IP address
+ description: IP address of vGMUX
+ vg_vgmux_tunnel_vni:
+ type: number
+ label: vG-vGMUX tunnel vni
+ description: vni value of vG-vGMUX vxlan tunnel
#############
# #
@@ -233,6 +241,8 @@ resources:
__vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }
__hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
__hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
+ __mux_ip_addr__: { get_param: mux_ip_addr }
+ __vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni }
template: |
#!/bin/bash
@@ -252,6 +262,8 @@ resources:
echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt
echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
+ echo "__mux_ip_addr__" > /opt/config/mux_ip_addr.txt
+ echo "__vg_vgmux_tunnel_vni__" > /opt/config/vg_vgmux_tunnel_vni.txt
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gw_install.sh -o /opt/v_gw_install.sh