Merge branch 'docker_compose_update' into 'master'

Docker-compose update for vpp-upf service

See merge request oai/cn5g/oai-cn5g-fed!46

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

@@ -239,9 +239,7 @@ services:
             - MCC=208
             - REALM=3gppnetwork.org
             - NETWORK_UE_IP=12.2.1.0/24
-            - N3_IPV4_ADDRESS_REMOTE=192.168.72.141 #   GNB  IP Address
-            - N4_IPV4_ADDRESS_REMOTE=192.168.70.133 #   SMF  IP Address
-            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135 # EXT-DN IP Address
+            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135 # EXT-DN (NAT Gateway) IP Address
             - VPP_MAIN_CORE=0
             - VPP_CORE_WORKER=1
 #           - VPP_PLUGIN_PATH=/usr/lib64/vpp_plugins/                # RHEL7

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

@@ -277,9 +277,7 @@ services:
             - MCC=208
             - REALM=3gppnetwork.org
             - NETWORK_UE_IP=12.2.1.0/24
-            - N3_IPV4_ADDRESS_REMOTE=192.168.72.141 #   GNB  IP Address
-            - N4_IPV4_ADDRESS_REMOTE=192.168.70.133 #   SMF  IP Address
-            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135 # EXT-DN IP Address
+            - N6_IPV4_ADDRESS_REMOTE=192.168.73.135 # EXT-DN (NAT Gateway) IP Address
             - VPP_MAIN_CORE=0
             - VPP_CORE_WORKER=1
 #           - VPP_PLUGIN_PATH=/usr/lib64/vpp_plugins/                # RHEL7

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

@@ -28,6 +28,7 @@ services:
             - NGAPPeerAddr=192.168.70.132
             - GTPuLocalAddr=192.168.72.141
             - GTPuIFname=eth1
+#           - DEREG_AFTER=20 # Deregister UE after 20 Sec
         networks:
             public_net:
                 ipv4_address: 192.168.70.141

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

@@ -507,8 +507,7 @@ services:
             - REALM=3gppnetwork.org
             - NETWORK_UE_IP=12.2.1.0/24
             - N3_IPV4_ADDRESS_REMOTE=192.168.72.156 #   GNB  IP Address
-            - N4_IPV4_ADDRESS_REMOTE=192.168.70.140 #   SMF  IP Address
-            - N6_IPV4_ADDRESS_REMOTE=192.168.73.137 # EXT-DN IP Address
+            - N6_IPV4_ADDRESS_REMOTE=192.168.73.145 # EXT-DN (NAT Gateway) IP Address
             - VPP_MAIN_CORE=0
             - VPP_CORE_WORKER=1
             - VPP_PLUGIN_PATH=/usr/lib/x86_64-linux-gnu/vpp_plugins/

docs/DEPLOY_SA5G_BASIC_STATIC_UE_IP.md

@@ -195,7 +195,7 @@ docker-compose-host $: tshark -i demo-oai  -f -w /tmp/oai/static-ue-ip/capture.p
     <!---
     For CI purposes please ignore this line
     ``` shell
-    docker-compose-host $: sleep 10
+    docker-compose-host $: sleep 30
     ```
     -->
 

docs/DEPLOY_SA5G_SLICING.md

@@ -207,7 +207,7 @@ Creating rfsim5g-oai-nr-ue1 ... done
 ```
 Wait a bit 
 ``` shell
-docker-compose-host $: sleep 30
+docker-compose-host $: sleep 60
 ```
 
 ``` shell

docs/DEPLOY_SA5G_WITH_VPP_UPF.md

@@ -286,7 +286,7 @@ Creating gnbsim-vpp ... done
 <!---
 For CI purposes please ignore this line
 ``` shell
-docker-compose-host $: sleep 20
+docker-compose-host $: sleep 40
 ```
 -->