Merge branch 'fix_upf_interface_naming' into 'prepare-public-release'

changed interface naming style

See merge request oai/cn5g/oai-cn5g-upf-vpp!7

docker-compose/docker-compose.yml

@@ -18,7 +18,7 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_core:
+            public_net_cp:
                 ipv4_address: 192.168.71.131
     oai-nrf:
         container_name: "oai-nrf"
@@ -31,7 +31,7 @@ services:
             - INSTANCE=0
             - PID_DIRECTORY=/var/run
         networks:
-            public_net_core:
+            public_net_cp:
                 ipv4_address: 192.168.71.130
         volumes:
             - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
@@ -105,7 +105,7 @@ services:
             timeout: 15s
             retries: 5
         networks:
-            public_net_core:
+            public_net_cp:
                 ipv4_address: 192.168.71.132
     oai-smf:
         container_name: "oai-smf"
@@ -151,34 +151,30 @@ services:
              timeout: 5s
              retries: 5
         networks:
-            public_net_core:
+            public_net_cp:
                 ipv4_address: 192.168.71.133
     vpp-upf:
         image: oai-upf-vpp:latest
         privileged: true
         container_name: vpp-upf
         environment:
-            - NWI_CORE=core.oai.org
-            - NWI_ACCESS=access.oai.org
-            - NWI_SGI=sgi.oai.org
+            - NWI_N3=access.oai.org
+            - NWI_N6=core.oai.org
             - GW_ID=1
             - MNC03=95
             - MCC=208
             - REALM=3gppnetwork.org
             - NETWORK_UE_IP=12.1.1.0/24
-            - N3_IPV4_ADDRESS_REMOTE=192.168.72.141
-            - N3_IPV4_ADDRESS_LOCAL=192.168.72.202
-            - N4_IPV4_ADDRESS_REMOTE=192.168.71.133
-            - N4_IPV4_ADDRESS_LOCAL=192.168.71.202            
-            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135
-            - N6_IPV4_ADDRESS_LOCAL=192.168.73.202
+            - N3_IPV4_ADDRESS_REMOTE=192.168.72.141 #   GNB  IP Address
+            - N4_IPV4_ADDRESS_REMOTE=192.168.71.133 #   SMF  IP Address
+            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135 # EXT-DN IP Address
             - VPP_MAIN_CORE=0
             - VPP_CORE_WORKER=1
 #           - VPP_PLUGIN_PATH=/usr/lib64/vpp_plugins/                # RHEL7
             - VPP_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/vpp_plugins/ # Ubntu18.04
             - INTERFACE_ACCESS=eth0
             - INTERFACE_CORE=eth1
-            - INTERFACE_SGI=eth2
+            - INTERFACE_CP=eth2
             - NSSAI_SD_0=222
             - SST=123
             - DNN=default
@@ -192,11 +188,11 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_core:
+            public_net_cp:
                 ipv4_address: 192.168.71.134
             public_net_access:
                 ipv4_address: 192.168.72.134
-            public_net_sgi_lan:
+            public_net_core:
                 ipv4_address: 192.168.73.134
     oai-ext-dn:
         image: ubuntu:bionic
@@ -210,11 +206,11 @@ services:
         depends_on:
             - vpp-upf
         networks:
-            public_net_sgi_lan:
+            public_net_core:
                 ipv4_address: 192.168.73.135
 networks:
-    public_net_core:
-        name: oai-public-core
+    public_net_cp:
+        name: oai-public-cp
         ipam:
             config:
                 - subnet: 192.168.71.0/24
@@ -227,10 +223,10 @@ networks:
                 - subnet: 192.168.72.0/24
         driver_opts:
             com.docker.network.bridge.name: "cn5g-access"
-    public_net_sgi_lan:
-        name: oai-public-sgi-lan
+    public_net_core:
+        name: oai-public-core
         ipam:
             config:
                 - subnet: 192.168.73.0/24
         driver_opts:
-            com.docker.network.bridge.name: "cn5g-sgi"
+            com.docker.network.bridge.name: "cn5g-core"

docs/BUILD_IMAGE.md

@@ -19,7 +19,7 @@ Here in our network configuration, we need to pass the "GIT PROXY" configuration
 ## 3.1 On a Ubuntu 18.04 Host ##
 
 ```bash
-$ docker build --target oai-upf-vpp --tag vpp-upg:develop \
+$ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \
                --file docker/Dockerfile.upf-vpp.ubuntu18 \
                --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
 ```
@@ -27,7 +27,7 @@ $ docker build --target oai-upf-vpp --tag vpp-upg:develop \
 ##  3.2 On a RHEL 7 Host ##
 
 ```bash
-$ docker build --target oai-upf-vpp --tag vpp-upg:develop \
+$ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \
                --file docker/Dockerfile.upf-vpp.rhel7 \
                --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
 ```

scripts/entrypoint.sh

@@ -39,13 +39,13 @@
 set -euo pipefail
 
 CONFIG_DIR="/openair-upf/etc"
-SGI_IPV4=$(ifconfig $INTERFACE_SGI | grep "inet " | awk '{print $2}')
+SGI_IPV4=$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}')
 ACCESS_IPV4=$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}')
-CORE_IPV4=$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}')
+CORE_IPV4=$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}')
 
 N3_IPV4_ADDRESS_LOCAL=$(ifconfig $INTERFACE_ACCESS | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"
-N4_IPV4_ADDRESS_LOCAL=$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"
-N6_IPV4_ADDRESS_LOCAL=$(ifconfig $INTERFACE_SGI | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"
+N4_IPV4_ADDRESS_LOCAL=$(ifconfig $INTERFACE_CP | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"
+N6_IPV4_ADDRESS_LOCAL=$(ifconfig $INTERFACE_CORE | grep "inet " | awk '{print $2}' | cut -d"." -f1-3)".202"
 
 ###############################
 # UPF Config
@@ -82,18 +82,18 @@ done
 #
 
 ip link set $INTERFACE_ACCESS down
-ip link set $INTERFACE_ACCESS name access
-ip link set access up
+ip link set $INTERFACE_ACCESS name n3
+ip link set n3 up
 
-ip link set $INTERFACE_CORE down
-ip link set $INTERFACE_CORE name core
-ip link set core up
+ip link set $INTERFACE_CP down
+ip link set $INTERFACE_CP name n4
+ip link set n4 up
 
-ip link set $INTERFACE_SGI down
-ip link set $INTERFACE_SGI name sgi
-ip link set sgi up
+ip link set $INTERFACE_CORE down
+ip link set $INTERFACE_CORE name n6
+ip link set n6 up
 
-ip route add $NETWORK_UE_IP via $SGI_IPV4 dev sgi
+ip route add $NETWORK_UE_IP via $SGI_IPV4 dev n6
 
 echo "Done setting the configuration"
 

scripts/upf_conf/init.conf

 ip table add 1
 ip table add 2
 
-create host-interface name sgi
-set interface mtu 1500 host-sgi
-set interface ip table host-sgi 1
-set interface ip address host-sgi @N6_IPV4_ADDRESS_LOCAL@/24
-set interface state host-sgi up
-
-create host-interface name core
-set interface mtu 1500 host-core
-set interface ip table host-core 0
-set interface ip address host-core @N4_IPV4_ADDRESS_LOCAL@/24
-set interface state host-core up
-
-create host-interface name access
-set interface mtu 1500 host-access
-set interface ip table host-access 2
-set interface ip address host-access @N3_IPV4_ADDRESS_LOCAL@/24
-set interface state host-access up
-
-ip route add 0.0.0.0/0 table 2 via @N3_IPV4_ADDRESS_REMOTE@ host-access
-ip route add 0.0.0.0/0 table 0 via @N4_IPV4_ADDRESS_REMOTE@ host-core
-ip route add 0.0.0.0/0 table 1 via @N6_IPV4_ADDRESS_REMOTE@ host-sgi
+create host-interface name n6
+set interface mtu 1500 host-n6
+set interface ip table host-n6 1
+set interface ip address host-n6 @N6_IPV4_ADDRESS_LOCAL@/24
+set interface state host-n6 up
+
+create host-interface name n4
+set interface mtu 1500 host-n4
+set interface ip table host-n4 0
+set interface ip address host-n4 @N4_IPV4_ADDRESS_LOCAL@/24
+set interface state host-n4 up
+
+create host-interface name n3
+set interface mtu 1500 host-n3
+set interface ip table host-n3 2
+set interface ip address host-n3 @N3_IPV4_ADDRESS_LOCAL@/24
+set interface state host-n3 up
+
+ip route add 0.0.0.0/0 table 2 via @N3_IPV4_ADDRESS_REMOTE@ host-n3
+ip route add 0.0.0.0/0 table 0 via @N4_IPV4_ADDRESS_REMOTE@ host-n4
+ip route add 0.0.0.0/0 table 1 via @N6_IPV4_ADDRESS_REMOTE@ host-n6
 
 upf pfcp endpoint ip @N4_IPV4_ADDRESS_LOCAL@ vrf 0
 upf node-id fqdn gw@GW_ID@.vppupf.node.5gcn.mnc@MNC03@.mcc@MCC@.@REALM@
 
-upf nwi name @NWI_CORE@ vrf 0
-upf nwi name @NWI_ACCESS@ vrf 2
-upf nwi name @NWI_SGI@ vrf 1
+upf nwi name @NWI_N3@ vrf 2
+upf nwi name @NWI_N6@ vrf 1
 
 upf specification release 16
 
-upf gtpu endpoint ip @N3_IPV4_ADDRESS_LOCAL@ nwi @NWI_ACCESS@ teid 0x000004d2/2
+upf gtpu endpoint ip @N3_IPV4_ADDRESS_LOCAL@ nwi @NWI_N3@ teid 0x000004d2/2

scripts/upf_conf/upf_profile.json

@@ -24,15 +24,15 @@
 			}
 		}],
 		"interfaceUpfInfoList": [{
-			"endpointFqdn": "@NWI_ACCESS@",
+			"endpointFqdn": "@NWI_N3@",
 			"interfaceType": "N3",
 			"ipv4EndpointAddresses": ["@ACCESS_IPV4@"],
-			"networkInstance": "@NWI_ACCESS@"
+			"networkInstance": "@NWI_N3@"
 		}, {
-			"endpointFqdn": "@NWI_CORE@",
+			"endpointFqdn": "@NWI_N6@",
 			"interfaceType": "N6",
 			"ipv4EndpointAddresses": ["@CORE_IPV4@"],
-			"networkInstance": "@NWI_CORE@"
+			"networkInstance": "@NWI_N6@"
 		}]
 
 	}