[SMF/UPF] Changes subnet configuration (open5gs#2975)

The way subnet is set up has changed as shown below. ``` <OLD Format> smf: session: - subnet: 10.45.0.1/16 <NEW Format> smf: session: - subnet: 10.45.0.0/16 gateway: 10.45.0.1 ``` For more information, please refer to Pull Request open5gs#2975.
pespin · Apr 13, 2024 · a6830b3 · a6830b3
1 parent 2b6369e
commit a6830b3
Show file tree

Hide file tree

Showing 27 changed files with 202 additions and 109 deletions.
diff --git a/configs/310014.yaml.in b/configs/310014.yaml.in
@@ -109,8 +109,9 @@ smf:
     server:
       - address: 127.0.0.4
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -189,8 +190,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/csfb.yaml.in b/configs/csfb.yaml.in
@@ -142,8 +142,9 @@ smf:
     server:
       - address: 127.0.0.4
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -219,8 +220,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/5gc-sepp1-999-70.yaml.in b/configs/examples/5gc-sepp1-999-70.yaml.in
@@ -112,8 +112,9 @@ smf:
       - address: 127.0.1.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,8 +208,9 @@ upf:
     server:
       - address: 127.0.1.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.1.7

diff --git a/configs/examples/5gc-sepp2-001-01.yaml.in b/configs/examples/5gc-sepp2-001-01.yaml.in
@@ -112,8 +112,9 @@ smf:
       - address: 127.0.2.4
         port: 9090
   session:
-    - subnet: 10.46.0.1/16
-    - subnet: 2001:db8:babe::1/48
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
+    - subnet: 2001:db8:babe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,9 +208,10 @@ upf:
     server:
       - address: 127.0.2.7
   session:
-    - subnet: 10.46.0.1/16
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
       dev: ogstun2
-    - subnet: 2001:db8:babe::1/48
+    - subnet: 2001:db8:babe::/48
       dev: ogstun2
   metrics:
     server:

diff --git a/configs/examples/5gc-sepp3-315-010.yaml.in b/configs/examples/5gc-sepp3-315-010.yaml.in
@@ -112,8 +112,9 @@ smf:
       - address: 127.0.3.4
         port: 9090
   session:
-    - subnet: 10.47.0.1/16
-    - subnet: 2001:db8:face::1/48
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
+    - subnet: 2001:db8:face::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -207,9 +208,10 @@ upf:
     server:
       - address: 127.0.3.7
   session:
-    - subnet: 10.47.0.1/16
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
       dev: ogstun3
-    - subnet: 2001:db8:face::1/48
+    - subnet: 2001:db8:face::/48
       dev: ogstun3
   metrics:
     server:

diff --git a/configs/examples/5gc-tls-sepp1-999-70.yaml.in b/configs/examples/5gc-tls-sepp1-999-70.yaml.in
@@ -113,8 +113,9 @@ smf:
       - address: 127.0.1.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -208,8 +209,9 @@ upf:
     server:
       - address: 127.0.1.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.1.7

diff --git a/configs/examples/5gc-tls-sepp2-001-01.yaml.in b/configs/examples/5gc-tls-sepp2-001-01.yaml.in
@@ -113,8 +113,9 @@ smf:
       - address: 127.0.2.4
         port: 9090
   session:
-    - subnet: 10.46.0.1/16
-    - subnet: 2001:db8:babe::1/48
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
+    - subnet: 2001:db8:babe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -208,9 +209,10 @@ upf:
     server:
       - address: 127.0.2.7
   session:
-    - subnet: 10.46.0.1/16
+    - subnet: 10.46.0.0/16
+      gateway: 10.46.0.1
       dev: ogstun2
-    - subnet: 2001:db8:babe::1/48
+    - subnet: 2001:db8:babe::/48
       dev: ogstun2
   metrics:
     server:

diff --git a/configs/examples/5gc-tls-sepp3-315-010.yaml.in b/configs/examples/5gc-tls-sepp3-315-010.yaml.in
@@ -113,8 +113,9 @@ smf:
       - address: 127.0.3.4
         port: 9090
   session:
-    - subnet: 10.47.0.1/16
-    - subnet: 2001:db8:face::1/48
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
+    - subnet: 2001:db8:face::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -208,9 +209,10 @@ upf:
     server:
       - address: 127.0.3.7
   session:
-    - subnet: 10.47.0.1/16
+    - subnet: 10.47.0.0/16
+      gateway: 10.47.0.1
       dev: ogstun3
-    - subnet: 2001:db8:face::1/48
+    - subnet: 2001:db8:face::/48
       dev: ogstun3
   metrics:
     server:

diff --git a/configs/examples/gnb-001-01-ue-001-01.yaml.in b/configs/examples/gnb-001-01-ue-001-01.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-001-01-ue-315-010.yaml.in b/configs/examples/gnb-001-01-ue-315-010.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-001-01-ue-999-70.yaml.in b/configs/examples/gnb-001-01-ue-999-70.yaml.in
@@ -116,8 +116,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -198,8 +199,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-315-010-ue-001-01.yaml.in b/configs/examples/gnb-315-010-ue-001-01.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-315-010-ue-315-010.yaml.in b/configs/examples/gnb-315-010-ue-315-010.yaml.in
@@ -116,8 +116,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -198,8 +199,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-315-010-ue-999-70.yaml.in b/configs/examples/gnb-315-010-ue-999-70.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-999-70-ue-001-01.yaml.in b/configs/examples/gnb-999-70-ue-001-01.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7

diff --git a/configs/examples/gnb-999-70-ue-315-010.yaml.in b/configs/examples/gnb-999-70-ue-315-010.yaml.in
@@ -118,8 +118,9 @@ smf:
       - address: 127.0.0.4
         port: 9090
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   dns:
     - 8.8.8.8
     - 8.8.4.4
@@ -203,8 +204,9 @@ upf:
     server:
       - address: 127.0.0.7
   session:
-    - subnet: 10.45.0.1/16
-    - subnet: 2001:db8:cafe::1/48
+    - subnet: 10.45.0.0/16
+      gateway: 10.45.0.1
+    - subnet: 2001:db8:cafe::/48
   metrics:
     server:
       - address: 127.0.0.7