Fix Connection problem between eNB and EPC
* RRU to NAT: Change REDIS to use `116.0.0.0/24` in database
* SPGW-C to SPGW-U: Change SGW-S1U-IP to Dataplane hostname
Change-Id: Ic9c5abf447591773de1c4758a5303b5e0edb71de
diff --git a/mcord/mcord-control-plane/Chart.yaml b/mcord/mcord-control-plane/Chart.yaml
index edbb6c2..e4ad5cc 100644
--- a/mcord/mcord-control-plane/Chart.yaml
+++ b/mcord/mcord-control-plane/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD Control Plane Services
name: mcord-control-plane
-version: 0.1.3
+version: 0.1.4
diff --git a/mcord/mcord-control-plane/templates/cp.yaml b/mcord/mcord-control-plane/templates/cp.yaml
index 563336f..c6dee13 100644
--- a/mcord/mcord-control-plane/templates/cp.yaml
+++ b/mcord/mcord-control-plane/templates/cp.yaml
@@ -64,10 +64,10 @@
image: {{ .Values.ngic_cp.images.cp }}
imagePullPolicy: IfNotPresent
stdin: true
- command: [ "bash", "-xc"]
+ command: [ "bash", "-xc" ]
args:
- - export HOSTIP=$(ip route get 1 | awk '{print $NF;exit}');
- echo "$HOSTIP" > /opt/ngic/config/shared/SGW_S1U_IP;
+ - export DP_S1U_IP="{{ .Values.spgwu_s1u_ip }}";
+ echo "$DP_S1U_IP" > /opt/ngic/config/shared/SGW_S1U_IP;
. /opt/ngic/config/cp_config.cfg;
sleep 20;
./ngic_controlplane $EAL_ARGS -- $APP_ARGS;
diff --git a/mcord/mcord-control-plane/values.yaml b/mcord/mcord-control-plane/values.yaml
index c61a6f8..5e3ef5b 100644
--- a/mcord/mcord-control-plane/values.yaml
+++ b/mcord/mcord-control-plane/values.yaml
@@ -23,6 +23,8 @@
mme_hostname: "mme"
spgwc_hostname: "ngic-cp"
spgwu_hostname: "ngic-dp"
+# Need to get SPGW-U interface IP address to put at here
+spgwu_s1u_ip: "119.0.0.45"
spgwu_port: 20
hss:
diff --git a/mcord/mcord-data-plane/Chart.yaml b/mcord/mcord-data-plane/Chart.yaml
index 85a41d9..de3d208 100644
--- a/mcord/mcord-data-plane/Chart.yaml
+++ b/mcord/mcord-data-plane/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD Data Plane Services
name: mcord-data-plane
-version: 0.1.3
+version: 0.1.4
diff --git a/mcord/mcord-data-plane/templates/accelleran.yaml b/mcord/mcord-data-plane/templates/accelleran.yaml
index eb9f5d5..6acd07c 100644
--- a/mcord/mcord-data-plane/templates/accelleran.yaml
+++ b/mcord/mcord-data-plane/templates/accelleran.yaml
@@ -91,7 +91,7 @@
command: ["sh", "-c"]
args:
# FIXME: Redis can't support with dns resolution, can't set hostname at here.
- - (sleep 5; redis-cli -h localhost -p 6379 set NATS_SERVICE_URL "nat://{{ .Values.accelleran_hostname }}:4222";) &
+ - (sleep 5; redis-cli -h localhost -p 6379 set NATS_SERVICE_URL "nat://$(ip route get 116 | awk '{print $NF;exit}'):4222";) &
/usr/local/bin/redis-server
resources:
limits:
diff --git a/mcord/mcord-data-plane/templates/dp.yaml b/mcord/mcord-data-plane/templates/dp.yaml
index 4bdf14f..53137ce 100644
--- a/mcord/mcord-data-plane/templates/dp.yaml
+++ b/mcord/mcord-data-plane/templates/dp.yaml
@@ -81,7 +81,7 @@
command: [ "bash", "-xc"]
args:
- ifconfig lo down;
- ifconfig -a;
+ ifconfig;
. /opt/ngic/config/dp_config.cfg;
./ngic_dataplane $EAL_ARGS -- $APP_ARGS
volumeMounts: