Configure route to vBRG via vBNG on vGMUX

Add parameters to the heat template to allow
configuration of the route the vBRG from the vGMUX
via the vBNG.

Change-Id: I7aef31af7470ceb264af06326af8724246c7d8ed
Issue-ID: INT-63
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index e81afa7..4b486a8 100644 (file)
--- 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 ecdb1b1..43bbb98 100644 (file)
--- 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/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh
index 50f754d..5e98fe1 100644 (file)
--- a/vnfs/vCPE/scripts/v_gmux_install.sh
+++ b/vnfs/vCPE/scripts/v_gmux_install.sh
@@ -14,8 +14,10 @@ LIBEVEL_PATCH_URL=$(cat /opt/config/libevel_patch_url.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 MUX_GW_IP=$(cat /opt/config/mux_gw_net_ipaddr.txt)
 MUX_GW_CIDR=$(cat /opt/config/mux_gw_net_cidr.txt)
-BNG_MUX_IP=$(cat /opt/config/bng_mux_net_ipaddr.txt)
+MUX_TO_BNG_IP=$(cat /opt/config/mux_to_bng_net_ipaddr.txt)
 BNG_MUX_CIDR=$(cat /opt/config/bng_mux_net_cidr.txt)
+BRG_BNG_CIDR=$(cat /opt/config/brg_bng_net_cidr.txt)
+BNG_TO_MUX_IP=$(cat /opt/config/bng_to_mux_net_ipaddr.txt)
 
 # Build states are:
 # 'build' - just build the code
@@ -234,10 +236,11 @@ EOF
 
     cat > /etc/vpp/setup.gate << EOF
 set int state ${BNG_MUX_NIC} up
-set int ip address ${BNG_MUX_NIC} ${BNG_MUX_IP}/${BNG_MUX_CIDR#*/}
+set int ip address ${BNG_MUX_NIC} ${MUX_TO_BNG_IP}/${BNG_MUX_CIDR#*/}
 
 set int state ${MUX_GW_NIC} up
 set int ip address ${MUX_GW_NIC} ${MUX_GW_IP}/${MUX_GW_CIDR#*/}
+ip route add ${BRG_BNG_CIDR} via ${BNG_TO_MUX_IP} ${BNG_MUX_NIC}
 EOF
 
 fi  # endif BUILD_STATE != "build"