summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Welch <matt.welch@intel.com>2017-10-31 16:37:25 -0400
committerMatt Welch <matt.welch@intel.com>2017-11-02 16:42:38 -0400
commit8c78ad40d782394b7d81ad33fea6a1458c582158 (patch)
tree7323bd902f9839f9465167560ced32b97638baec
parente9a312fc7323cfd720f9fb50826473b7d2525ae6 (diff)
Update vBNG for communication with SDNC
Enable ipv4 forwarding on vbng and add config to enable communication with the sdnc VNF. Updated 'dummy' addresses from 30.0.0.0/24 to 192.168.40.0/24 subnet to prevent collision with public IP subnet. Change-Id: I89d3b8d972822caaedeab2aa00dd4a0c9f19654d Issue-ID: INT-63 Signed-off-by: Matt Welch <matt.welch@intel.com>
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.env1
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.yaml2
-rw-r--r--vnfs/vCPE/scripts/v_bng_init.sh2
-rw-r--r--vnfs/vCPE/scripts/v_bng_install.sh10
4 files changed, 15 insertions, 0 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..f32a5c08 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml
@@ -257,6 +257,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 +281,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/vnfs/vCPE/scripts/v_bng_init.sh b/vnfs/vCPE/scripts/v_bng_init.sh
index 6fb2eadc..e4a59835 100644
--- a/vnfs/vCPE/scripts/v_bng_init.sh
+++ b/vnfs/vCPE/scripts/v_bng_init.sh
@@ -2,3 +2,5 @@
systemctl start vpp
+ip route add 10.3.0.0/24 via 192.168.40.41 dev tap0
+
diff --git a/vnfs/vCPE/scripts/v_bng_install.sh b/vnfs/vCPE/scripts/v_bng_install.sh
index e20128c5..49bca161 100644
--- a/vnfs/vCPE/scripts/v_bng_install.sh
+++ b/vnfs/vCPE/scripts/v_bng_install.sh
@@ -16,6 +16,7 @@ BRGEMU_BNG_NET_CIDR=$(cat /opt/config/brgemu_bng_net_cidr.txt)
BRGEMU_BNG_NET_IPADDR=$(cat /opt/config/brgemu_bng_net_ipaddr.txt)
CPE_SIGNAL_NET_CIDR=$(cat /opt/config/cpe_signal_net_cidr.txt)
CPE_SIGNAL_NET_IPADDR=$(cat /opt/config/cpe_signal_net_ipaddr.txt)
+SDNC_IP_ADDR=$(cat /opt/config/sdnc_ip_addr.txt)
# Build states are:
# 'build' - just build the code
@@ -64,6 +65,10 @@ fi # endif BUILD_STATE != "build"
if [[ $BUILD_STATE != "done" ]]
then
+ # Enable IPV4 forwarding through kernel
+ sed -i 's/^.*\(net.ipv4.ip_forward\).*/\1=1/g' /etc/sysctl.conf
+ sysctl -p /etc/sysctl.conf
+
# Download required dependencies
echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list
@@ -250,6 +255,11 @@ set interface ip address ${BNG_GMUX_NIC} ${BNG_GMUX_NET_IPADDR}/${BNG_GMUX_NET_C
set vbng dhcp4 remote 10.4.0.1 local ${CPE_SIGNAL_NET_IPADDR}
set vbng aaa config /etc/vpp/vbng-aaa.cfg nas-port 5060
+tap connect tap0 address 192.168.40.40/24
+set int state tap-0 up
+set int ip address tap-0 192.168.40.41/24
+ip route add ${SDNC_IP_ADDR}/32 via 192.168.40.40 tap-0
+
EOF
cat > /etc/vpp/vbng-aaa.cfg << EOF