Merge branch 'vpp_docker_compose_update' into 'master'

Vpp docker compose update

See merge request !32

docker-compose/docker-compose-basic-vpp-nonrf.yaml

@@ -18,7 +18,7 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.131
     oai-udr:
         container_name: "oai-udr"
@@ -39,7 +39,7 @@ services:
         depends_on:
             - mysql
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.136
         volumes:
             - ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
@@ -67,7 +67,7 @@ services:
         depends_on:
             - oai-udr
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.137
         volumes:
             - ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
@@ -94,7 +94,7 @@ services:
         depends_on:
             - oai-udm
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.138
         volumes:
             - ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
@@ -171,7 +171,7 @@ services:
             timeout: 15s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.132
     oai-smf:
         container_name: "oai-smf"
@@ -217,7 +217,7 @@ services:
              timeout: 5s
              retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.133
     vpp-upf:
         image: oai-upf-vpp:latest
@@ -238,9 +238,9 @@ services:
             - 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_CP=eth2
+            - INTERFACE_ACCESS=eth1
+            - INTERFACE_CORE=eth2
+            - INTERFACE_CP=eth0
             - NSSAI_SD_0=222
             - SST=123
             - DNN=default
@@ -254,7 +254,7 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.134
             public_net_access:
                 ipv4_address: 192.168.72.134
@@ -265,7 +265,7 @@ services:
         privileged: true
         container_name: "oai-ext-dn"
         entrypoint: /bin/bash -c \
-              "apt update; apt install -y iptables iproute2 iputils-ping;"\
+              "apt update; apt install -y iptables iproute2 iperf3 iputils-ping;"\
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.73.202 dev eth0; sleep infinity"
         command: ["/bin/bash", "-c", "trap : TERM INT; sleep infinity & wait"]
@@ -275,13 +275,14 @@ services:
             public_net_core:
                 ipv4_address: 192.168.73.135
 networks:
-    public_net_cp:
-        name: oai-public-cp
+    public_net:
+        driver: bridge
+        name: demo-oai-public-net
         ipam:
             config:
                 - subnet: 192.168.70.0/24
         driver_opts:
-            com.docker.network.bridge.name: "cn5g-public"
+            com.docker.network.bridge.name: "demo-oai"
     public_net_access:
         name: oai-public-access
         ipam:

docker-compose/docker-compose-basic-vpp-nrf.yaml

@@ -18,7 +18,7 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.131
     oai-udr:
         container_name: "oai-udr"
@@ -40,7 +40,7 @@ services:
             - mysql
             - oai-nrf
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.136
         volumes:
             - ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
@@ -68,7 +68,7 @@ services:
         depends_on:
             - oai-udr
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.137
         volumes:
             - ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
@@ -95,7 +95,7 @@ services:
         depends_on:
             - oai-udm
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.138
         volumes:
             - ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
@@ -115,7 +115,7 @@ services:
             - INSTANCE=0
             - PID_DIRECTORY=/var/run
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.130
         volumes:
             - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
@@ -192,7 +192,7 @@ services:
             timeout: 15s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.132
     oai-smf:
         container_name: "oai-smf"
@@ -238,7 +238,7 @@ services:
              timeout: 5s
              retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.133
     vpp-upf:
         image: oai-upf-vpp:latest
@@ -259,9 +259,9 @@ services:
             - 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_CP=eth2
+            - INTERFACE_ACCESS=eth1
+            - INTERFACE_CORE=eth2
+            - INTERFACE_CP=eth0
             - NSSAI_SD_0=123
             - SST=222
             - DNN=default
@@ -277,7 +277,7 @@ services:
             timeout: 5s
             retries: 5
         networks:
-            public_net_cp:
+            public_net:
                 ipv4_address: 192.168.70.134
             public_net_access:
                 ipv4_address: 192.168.72.134
@@ -288,7 +288,7 @@ services:
         privileged: true
         container_name: "oai-ext-dn"
         entrypoint: /bin/bash -c \
-              "apt update; apt install -y iptables iproute2 iputils-ping;"\
+              "apt update; apt install -y iptables iproute2 iperf3 iputils-ping;"\
               "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
               "ip route add 12.1.1.0/24 via 192.168.73.202 dev eth0; sleep infinity"
         command: ["/bin/bash", "-c", "trap : TERM INT; sleep infinity & wait"]
@@ -298,13 +298,14 @@ services:
             public_net_core:
                 ipv4_address: 192.168.73.135
 networks:
-    public_net_cp:
-        name: oai-public-cp
+    public_net:
+        driver: bridge
+        name: demo-oai-public-net
         ipam:
             config:
                 - subnet: 192.168.70.0/24
         driver_opts:
-            com.docker.network.bridge.name: "cn5g-public"
+            com.docker.network.bridge.name: "demo-oai"
     public_net_access:
         name: oai-public-access
         ipam:

docker-compose/docker-compose-gnbsim-vpp.yaml

+version: '3.8'
+services:
+    gnbsim-vpp:
+        container_name: gnbsim-vpp
+        image: gnbsim:latest
+        privileged: true
+        environment:
+            - MCC=208
+            - MNC=95
+            - GNBID=5
+            - TAC=0x00a000
+            - SST=222
+            - SD=00007b
+            - PagingDRX=v32
+            - RANUENGAPID=0
+            - IMEISV=35609204079514
+            - MSIN=0000000031
+            - RoutingIndicator=1234
+            - ProtectionScheme=null
+            - KEY=0C0A34601D4F07677303652C0462535B
+            - OPc=63bfa50ee6523365ff14c1f45f88737d
+            - DNN=default
+            - URL=http://www.asnt.org:8080/
+            - NRCellID=1
+            - USE_FQDN=no
+#           - USE_FQDN=yes
+#           - AMF_FQDN=amf.oai-5gc.eur
+            - NGAPPeerAddr=192.168.70.132
+            - GTPuLocalAddr=192.168.72.141
+            - GTPuIFname=eth1
+        networks:
+            public_net:
+                ipv4_address: 192.168.70.141
+            public_net_access:
+                ipv4_address: 192.168.72.141
+        healthcheck:
+            test: /bin/bash -c "ifconfig gtp-gnb"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+networks:
+    public_net:
+        external:
+            name: demo-oai-public-net
+    public_net_access:
+        external:
+            name: oai-public-access

docker-compose/docker-compose-gnbsim.yaml

@@ -24,11 +24,11 @@ services:
             - NRCellID=1
             - USE_FQDN=no
             - NGAPPeerAddr=192.168.70.132
-            - GTPuLocalAddr=192.168.70.136
+            - GTPuLocalAddr=192.168.70.156
             - GTPuIFname=eth0
         networks:
             public_net:
-                ipv4_address: 192.168.70.136
+                ipv4_address: 192.168.70.156
         healthcheck:
             test: /bin/bash -c "ifconfig gtp-gnb"
             interval: 10s
@@ -58,11 +58,11 @@ services:
             - NRCellID=1
             - USE_FQDN=no
             - NGAPPeerAddr=192.168.70.132
-            - GTPuLocalAddr=192.168.70.137
+            - GTPuLocalAddr=192.168.70.157
             - GTPuIFname=eth0
         networks:
             public_net:
-                ipv4_address: 192.168.70.137
+                ipv4_address: 192.168.70.157
         healthcheck:
             test: /bin/bash -c "ifconfig gtp-gnb"
             interval: 10s
@@ -92,11 +92,11 @@ services:
             - NRCellID=1
             - USE_FQDN=no
             - NGAPPeerAddr=192.168.70.132
-            - GTPuLocalAddr=192.168.70.138
+            - GTPuLocalAddr=192.168.70.158
             - GTPuIFname=eth0
         networks:
             public_net:
-                ipv4_address: 192.168.70.138
+                ipv4_address: 192.168.70.158
         healthcheck:
             test: /bin/bash -c "ifconfig gtp-gnb"
             interval: 10s
@@ -126,11 +126,11 @@ services:
             - NRCellID=1
             - USE_FQDN=no
             - NGAPPeerAddr=192.168.70.132
-            - GTPuLocalAddr=192.168.70.139
+            - GTPuLocalAddr=192.168.70.159
             - GTPuIFname=eth0
         networks:
             public_net:
-                ipv4_address: 192.168.70.139
+                ipv4_address: 192.168.70.159
         healthcheck:
             test: /bin/bash -c "ifconfig gtp-gnb"
             interval: 10s
@@ -160,11 +160,11 @@ services:
             - NRCellID=1
             - USE_FQDN=no
             - NGAPPeerAddr=192.168.70.132
-            - GTPuLocalAddr=192.168.70.140
+            - GTPuLocalAddr=192.168.70.160
             - GTPuIFname=eth0
         networks:
             public_net:
-                ipv4_address: 192.168.70.140
+                ipv4_address: 192.168.70.160
         healthcheck:
             test: /bin/bash -c "ifconfig gtp-gnb"
             interval: 10s
@@ -202,64 +202,7 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
-    gnbsim-vpp:
-        container_name: gnbsim-vpp
-        image: gnbsim:latest
-        privileged: true
-        environment:
-            - MCC=208
-            - MNC=95
-            - GNBID=5
-            - TAC=0x00a000
-            - SST=222
-            - SD=00007b
-            - PagingDRX=v32
-            - RANUENGAPID=0
-            - IMEISV=35609204079514
-            - MSIN=0000000035
-            - RoutingIndicator=1234
-            - ProtectionScheme=null
-            - KEY=0C0A34601D4F07677303652C0462535B
-            - OPc=63bfa50ee6523365ff14c1f45f88737d
-            - DNN=default
-            - URL=http://www.asnt.org:8080/
-            - NRCellID=1
-            - USE_FQDN=no
-#           - USE_FQDN=yes
-#           - AMF_FQDN=amf.oai-5gc.eur
-            - NGAPPeerAddr=192.168.71.132
-            - GTPuLocalAddr=192.168.72.141
-            - GTPuIFname=eth1
-        networks:
-            public_net_core:
-                ipv4_address: 192.168.71.141
-            public_net_access:
-                ipv4_address: 192.168.72.141
-        healthcheck:
-            test: /bin/bash -c "ifconfig gtp-gnb"
-            interval: 10s
-            timeout: 5s
-            retries: 5
 networks:
     public_net:
         external:
             name: demo-oai-public-net
-    public_net_core:
-        name: oai-public-core
-        ipam:
-            config:
-                - subnet: 192.168.71.0/24
-    public_net_access:
-        name: oai-public-access
-        ipam:
-            config:
-                - subnet: 192.168.72.0/24
-# Incase the user wants docker-compose to create a bridge rather than creating the bridge manually then uncomment the below lines
-#     public_net:
-#         driver: bridge
-#         name: demo-oai-public-net
-#         ipam:
-#             config:
-#                 - subnet: 192.168.70.128/26
-#         driver_opts:
-#             com.docker.network.bridge.name: "demo-oai"

docs/DEPLOY_SA5G_WITH_GNBSIM.md

@@ -61,7 +61,7 @@ we did for dsTest-host.
 * Before we proceed further for end-to-end SA5G test, make sure you have healthy docker services for OAI cn5g
 
 ```bash
-oai-cn5g-fed/docker-compose$ ./core-network.py --type start-mini --fqdn no --scenario 1
+oai-cn5g-fed/docker-compose$ python3 core-network.py --type start-mini --fqdn no --scenario 1
 ...
 [2021-09-14 16:44:47,176] root:DEBUG:  OAI 5G Core network is configured and healthy....
 ```
@@ -80,6 +80,11 @@ c25db05aa023   ubuntu:bionic                   "/bin/bash -c ' apt …"   23 sec
 oai-cn5g-fed/docker-compose$ 
 ```
 
+We can also use basic deployment of 5GCN (with AUSF, UDM, UDR) as below -
+
+```bash 
+oai-cn5g-fed/docker-compose$ python3 core-network.py --type start-basic
+```
 ## 6. Getting a `gnbsim` docker image ##
 
 You have the choice:
@@ -124,6 +129,7 @@ c25db05aa023   ubuntu:bionic                   "/bin/bash -c ' apt …"   4 minu
 ```
 Now we are ready to perform some traffic test.
 * Ping test <br/>
+
 Here we ping UE from external DN container.
 ```bash
 $ docker exec -it oai-ext-dn ping -c 3 12.1.1.2
@@ -137,6 +143,20 @@ PING 12.1.1.2 (12.1.1.2) 56(84) bytes of data.
 rtt min/avg/max/mdev = 0.145/0.276/0.448/0.127 ms
 rohan@rohan:~/gitrepo/oai-cn5g-fed/docker-compose$ 
 ```
+
+Here we ping external DN from UE (gnbsim) container.
+```bash
+oai-cn5g-fed/docker-compose$ docker exec gnbsim ping -c 3 -I 12.1.1.2 google.com
+PING google.com (172.217.18.238) from 12.1.1.2 : 56(84) bytes of data.
+64 bytes from par10s10-in-f238.1e100.net (172.217.18.238): icmp_seq=1 ttl=115 time=5.12 ms
+64 bytes from par10s10-in-f238.1e100.net (172.217.18.238): icmp_seq=2 ttl=115 time=7.52 ms
+64 bytes from par10s10-in-f238.1e100.net (172.217.18.238): icmp_seq=3 ttl=115 time=7.19 ms
+
+--- google.com ping statistics ---
+3 packets transmitted, 3 received, 0% packet loss, time 4ms
+rtt min/avg/max/mdev = 5.119/6.606/7.515/1.064 ms
+```
+
 * Iperf test <br/>
 Here we do iperf traffic test between gnbsim UE and external DN node. We can make any node as iperf server/client.<br/>
 Running iperf server on external DN container
@@ -221,6 +241,12 @@ Here we try some scaling test with gnbsim. There are additional IMSIs are added
 ```bash
 oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim.yaml up -d gnbsim2
 Creating gnbsim2 ... done
+oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim.yaml up -d gnbsim3
+Creating gnbsim3 ... done
+oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim.yaml up -d gnbsim4
+Creating gnbsim4 ... done
+oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim.yaml up -d gnbsim5
+Creating gnbsim5 ... done
 ```
 So here basically, minimum configuration parameters that need to change is gnbid, imsi and container ip address in docker-compose-gnbsim.yaml.
 Please make sure status of instance is healthy before creating one more instance. Now here we have deployed all 5 gnbsim intances - 
@@ -309,7 +335,15 @@ Last thing is to remove all services - <br/>
 ```bash
 /oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim.yaml down
 Stopping service gnbsim ...
+Stopping gnbsim5 ... done
+Stopping gnbsim4 ... done
+Stopping gnbsim3 ... done
+Stopping gnbsim2 ... done
 Stopping gnbsim ... done
+Removing gnbsim5 ... done
+Removing gnbsim4 ... done
+Removing gnbsim3 ... done
+Removing gnbsim2 ... done
 Removing gnbsim ... done
 Network demo-oai-public-net is external, skipping
 Service gnbsim is  stopped
@@ -317,7 +351,7 @@ Service gnbsim is  stopped
 
 * Undeploy the core network
 ```bash
-oai-cn5g-fed/docker-compose$ ./core-network.py --type stop-mini --fqdn no --scenario 1
+oai-cn5g-fed/docker-compose$ python3 ./core-network.py --type stop-mini --fqdn no --scenario 1
 ...
 [2021-09-14 16:47:44,070] root:DEBUG:  OAI 5G core components are UnDeployed....
 ```

docs/DEPLOY_SA5G_WITH_VPP_UPF.md

@@ -226,9 +226,35 @@ $ docker logs oai-smf
 
 ## 6. Stimuli with a RAN emulator ##
 
-**CAUTION: at time of writing (2021/10/29), this section is empty. Will be filled later.**
+### 6.1 Test with Gnbsim ###
+In this Section we will use Gnbsim to test our deployemt. Make sure you already have built [Gnbsim docker image](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/docs/DEPLOY_SA5G_WITH_GNBSIM.md#6-getting-a-gnbsim-docker-image)<br/>
+Launch gnbsim instance
+```bash
+oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim-vpp.yaml up -d gnbsim-vpp
+Creating gnbsim-vpp ... done
+```
 
+Make sure Gnbsim service is healthy
+``` bash
+oai-cn5g-fed/docker-compose$ docker-compose -f docker-compose-gnbsim-vpp.yaml ps -a
+   Name                 Command                  State       Ports
+------------------------------------------------------------------
+gnbsim-vpp   /gnbsim/bin/entrypoint.sh  ...   Up (healthy)        
+oai-cn5g-fed/docker-compose$ 
+```
 
+After successfull registration of UE, we can perform traffic test
+```bash
+/oai-cn5g-fed$ docker exec gnbsim-vpp ping -c 3 -I 12.1.1.2 google.com
+PING google.com (172.217.18.238) from 12.1.1.2 : 56(84) bytes of data.
+64 bytes from mrs08s02-in-f14.1e100.net (172.217.18.238): icmp_seq=1 ttl=114 time=9.89 ms
+64 bytes from mrs08s02-in-f14.1e100.net (172.217.18.238): icmp_seq=2 ttl=114 time=7.10 ms
+64 bytes from mrs08s02-in-f14.1e100.net (172.217.18.238): icmp_seq=3 ttl=114 time=6.72 ms
+
+--- google.com ping statistics ---
+3 packets transmitted, 3 received, 0% packet loss, time 5ms
+rtt min/avg/max/mdev = 6.716/7.900/9.890/1.418 ms
+```
 ## 7. Undeploy the Core Network ##
 
 ```bash