Update open5gs and ueransim IPs

Author: niloysh

README.md

@@ -34,6 +34,19 @@ To deploy Open5GS and its components, follow the deployment steps below:
 
 Please refer to the specific directories for more detailed instructions and usage examples.
 
+### IP Ranges
+This project uses overlay IPs for tunnels deployed with the OVS-CNI in Kubernetes. The CNI configuration is outlined in the `networks5g/`. 
+
+- `n2network` as IP `10.10.2.0/24`, `n3network` has IP `10.10.3.0/24`, `n4network` has IP `10.10.4.0/24`.
+- Due to constraints in srsRAN, both AMF and gNB currently utilize the `n3network` instead of `n2network`.
+- UPF N3 IP range is from `10.10.3.X` from `UPFX`. UPF N4 IP range is from `10.10.4.X` for `UPFX`.
+- SMF N4 IP range is from `10.10.4.{100 + X}` from `SMFX`
+- AMF IP range is from `10.10.3.200` to `10.10.3.230`.
+- gNB IP range is from `10.10.3.231` to `10.10.3.250`.
+
+Please use the above conventions when connecting external gNBs, e.g., srsRAN.
+
+
 ## Scripts
 The `bin` directory contains scripts for easily viewing logs and getting a shell on any of the NFs. Usage is as follows.
 ```bash

open5gs/common/amf/amf-configmap.yaml

@@ -28,7 +28,7 @@ data:
           port: 80
 
       ngap:
-        - addr: 10.10.3.10
+        - addr: 10.10.3.200
       metrics:
         - addr: 0.0.0.0
           port: 9090

open5gs/common/amf/amf-deployment.yaml

@@ -18,7 +18,7 @@ spec:
         nf: amf
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
-          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.10/24" ] }
+          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.200/24" ] }
           ]'
     spec:
       # nodeSelector:

open5gs/slices/slice1/smf1/smf-configmap.yaml

@@ -38,7 +38,7 @@ data:
         - addr: 0.0.0.0
           port: 9090
       subnet:
-        - addr: 10.45.0.1/16
+        - addr: 10.41.0.1/16
           dnn: internet
       dns:
         - 8.8.8.8

open5gs/slices/slice1/smf1/smf-deployment.yaml

@@ -21,8 +21,7 @@ spec:
         name: smf1
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
-          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.11/24" ] },
-          { "name": "n4network", "interface": "n4", "ips": [ "10.10.4.11/24" ] }
+          { "name": "n4network", "interface": "n4", "ips": [ "10.10.4.101/24" ] }
           ]'
     spec:
       # nodeSelector:

open5gs/slices/slice1/upf1/upf-configmap.yaml

@@ -18,7 +18,7 @@ data:
       gtpu:
         - dev: n3
       subnet:
-        - addr: 10.45.0.1/16
+        - addr: 10.41.0.1/16
           dnn: internet
       metrics:
         - addr: 0.0.0.0
@@ -29,7 +29,7 @@ data:
     #!/bin/bash   
 
     ip tuntap add name ogstun mode tun;
-    ip addr add 10.45.0.1/16 dev ogstun;
+    ip addr add 10.41.0.1/16 dev ogstun;
     sysctl -w net.ipv6.conf.all.disable_ipv6=1;
     ip link set ogstun up;
     sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward";

open5gs/slices/slice2/smf2/smf-configmap.yaml

@@ -38,7 +38,7 @@ data:
         - addr: 0.0.0.0
           port: 9090
       subnet:
-        - addr: 10.46.0.1/16
+        - addr: 10.42.0.1/16
           dnn: streaming
       dns:
         - 8.8.8.8

open5gs/slices/slice2/smf2/smf-deployment.yaml

@@ -21,8 +21,7 @@ spec:
         name: smf2
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
-          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.12/24" ] },
-          { "name": "n4network", "interface": "n4", "ips": [ "10.10.4.12/24" ] }
+          { "name": "n4network", "interface": "n4", "ips": [ "10.10.4.102/24" ] }
           ]'
     spec:
       # nodeSelector:

open5gs/slices/slice2/upf2/upf-configmap.yaml

@@ -17,7 +17,7 @@ data:
       gtpu:
         - dev: n3
       subnet:
-        - addr: 10.46.0.1/16
+        - addr: 10.42.0.1/16
           dnn: streaming
       metrics:
         - addr: 0.0.0.0
@@ -28,7 +28,7 @@ data:
     #!/bin/bash   
 
     ip tuntap add name ogstun mode tun;
-    ip addr add 10.46.0.1/16 dev ogstun;
+    ip addr add 10.42.0.1/16 dev ogstun;
     sysctl -w net.ipv6.conf.all.disable_ipv6=1;
     ip link set ogstun up;
     sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward";

ueransim/ueransim-gnb/config/open5gs-gnb.yaml

@@ -6,12 +6,12 @@ idLength: 32        # NR gNB ID length in bits [22...32]
 tac: 1              # Tracking Area Code
 
 linkIp: 0.0.0.0   # gNB's local IP address for Radio Link Simulation (Usually same with local IP)
-ngapIp: 10.10.3.22   # gNB's local IP address for N2 Interface (Usually same with local IP)
-gtpIp: 10.10.3.22    # gNB's local IP address for N3 Interface (Usually same with local IP)
+ngapIp: 10.10.3.231   # gNB's local IP address for N2 Interface (Usually same with local IP)
+gtpIp: 10.10.3.231    # gNB's local IP address for N3 Interface (Usually same with local IP)
 
 # List of AMF address information
 amfConfigs:
-  - address: 10.10.3.10
+  - address: 10.10.3.200
     port: 38412
 
 # List of supported S-NSSAIs by this gNB

ueransim/ueransim-gnb/gnb-deployment.yaml

@@ -19,8 +19,7 @@ spec:
         component: gnb
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
-          { "name": "n2network", "interface": "n2", "ips": [ "10.10.2.22/24" ] },
-          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.22/24" ] }
+          { "name": "n3network", "interface": "n3", "ips": [ "10.10.3.231/24" ] }
           ]'
     spec:
       containers: