Skip to content

Commit abbe269

Browse files
herlesupreethherlesupreeth
committed
Change subnet configuration as per new format in open5gs
1 parent 78c7396 commit abbe269

File tree

7 files changed

+31
-17
lines changed

7 files changed

+31
-17
lines changed

‎smf/ip_utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ def start(ip_range):
6060
raise ValueError('Invalid UE IPv4 range. Only one IP given')
6161
else:
6262
first_ip_addr = first_ip_addr.exploded
63-
ip_netmask_prefix = ip_range.prefixlen
64-
print(str(first_ip_addr) + '/' + str(ip_netmask_prefix))
63+
print(str(first_ip_addr))
6564

6665
if __name__ == '__main__':
6766
try:

‎smf/smf.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,20 @@ smf:
3838
upf:
3939
- address: UPF_IP
4040
session:
41-
- subnet: UE_IPV4_INTERNET_TUN_IP
41+
- subnet: UE_IPV4_INTERNET_SUBNET
42+
gateway: UE_IPV4_INTERNET_TUN_IP
4243
dnn: internet
4344
dev: ogstun
44-
- subnet: 2001:230:cafe::1/48
45+
- subnet: 2001:230:cafe::/48
46+
gateway: 2001:230:cafe::1
4547
dnn: internet
4648
dev: ogstun
47-
- subnet: UE_IPV4_IMS_TUN_IP
49+
- subnet: UE_IPV4_IMS_SUBNET
50+
gateway: UE_IPV4_IMS_TUN_IP
4851
dnn: ims
4952
dev: ogstun2
50-
- subnet: 2001:230:babe::1/48
53+
- subnet: 2001:230:babe::/48
54+
gateway: 2001:230:babe::1
5155
dnn: ims
5256
dev: ogstun2
5357
dns:

‎smf/smf_4g.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,20 @@ smf:
2929
upf:
3030
- address: UPF_IP
3131
session:
32-
- subnet: UE_IPV4_INTERNET_TUN_IP
32+
- subnet: UE_IPV4_INTERNET_SUBNET
33+
gateway: UE_IPV4_INTERNET_TUN_IP
3334
dnn: internet
3435
dev: ogstun
35-
- subnet: 2001:230:cafe::1/48
36+
- subnet: 2001:230:cafe::/48
37+
gateway: 2001:230:cafe::1
3638
dnn: internet
3739
dev: ogstun
38-
- subnet: UE_IPV4_IMS_TUN_IP
40+
- subnet: UE_IPV4_IMS_SUBNET
41+
gateway: UE_IPV4_IMS_TUN_IP
3942
dnn: ims
4043
dev: ogstun2
41-
- subnet: 2001:230:babe::1/48
44+
- subnet: 2001:230:babe::/48
45+
gateway: 2001:230:babe::1
4246
dnn: ims
4347
dev: ogstun2
4448
dns:

‎smf/smf_init.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ sed -i 's|UPF_IP|'$UPF_IP'|g' install/etc/open5gs/smf.yaml
5151
sed -i 's|SMF_DNS1|'$SMF_DNS1'|g' install/etc/open5gs/smf.yaml
5252
sed -i 's|SMF_DNS2|'$SMF_DNS2'|g' install/etc/open5gs/smf.yaml
5353
sed -i 's|UE_IPV4_INTERNET_TUN_IP|'$UE_IPV4_INTERNET_TUN_IP'|g' install/etc/open5gs/smf.yaml
54+
sed -i 's|UE_IPV4_INTERNET_SUBNET|'$UE_IPV4_INTERNET'|g' install/etc/open5gs/smf.yaml
5455
sed -i 's|UE_IPV4_IMS_TUN_IP|'$UE_IPV4_IMS_TUN_IP'|g' install/etc/open5gs/smf.yaml
56+
sed -i 's|UE_IPV4_IMS_SUBNET|'$UE_IPV4_IMS'|g' install/etc/open5gs/smf.yaml
5557
sed -i 's|PCSCF_IP|'$PCSCF_IP'|g' install/etc/open5gs/smf.yaml
5658
sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/smf.yaml
5759
sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/freeDiameter/smf.conf

‎upf/ip_utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ def start(ip_range):
6060
raise ValueError('Invalid UE IPv4 range. Only one IP given')
6161
else:
6262
first_ip_addr = first_ip_addr.exploded
63-
ip_netmask_prefix = ip_range.prefixlen
64-
print(str(first_ip_addr) + '/' + str(ip_netmask_prefix))
63+
print(str(first_ip_addr))
6564

6665
if __name__ == '__main__':
6766
try:

‎upf/upf.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ upf:
1818
- address: UPF_IP
1919
advertise: UPF_ADVERTISE_IP
2020
session:
21-
- subnet: UE_IPV4_INTERNET_TUN_IP
22-
dev: ogstun
21+
- subnet: UE_IPV4_INTERNET_SUBNET
22+
gateway: UE_IPV4_INTERNET_TUN_IP
2323
dnn: internet
24-
- subnet: 2001:230:cafe::1/48
2524
dev: ogstun
25+
- subnet: 2001:230:cafe::/48
26+
gateway: 2001:230:cafe::1
2627
dnn: internet
27-
- subnet: UE_IPV4_IMS_TUN_IP
28+
dev: ogstun
29+
- subnet: UE_IPV4_IMS_SUBNET
30+
gateway: UE_IPV4_IMS_TUN_IP
2831
dnn: ims
2932
dev: ogstun2
30-
- subnet: 2001:230:babe::1/48
33+
- subnet: 2001:230:babe::/48
34+
gateway: 2001:230:babe::1
3135
dnn: ims
3236
dev: ogstun2
3337
metrics:

‎upf/upf_init.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ cp /mnt/upf/upf.yaml install/etc/open5gs
4141
sed -i 's|UPF_IP|'$UPF_IP'|g' install/etc/open5gs/upf.yaml
4242
sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/open5gs/upf.yaml
4343
sed -i 's|UE_IPV4_INTERNET_TUN_IP|'$UE_IPV4_INTERNET_TUN_IP'|g' install/etc/open5gs/upf.yaml
44+
sed -i 's|UE_IPV4_INTERNET_SUBNET|'$UE_IPV4_INTERNET'|g' install/etc/open5gs/upf.yaml
4445
sed -i 's|UE_IPV4_IMS_TUN_IP|'$UE_IPV4_IMS_TUN_IP'|g' install/etc/open5gs/upf.yaml
46+
sed -i 's|UE_IPV4_IMS_SUBNET|'$UE_IPV4_IMS'|g' install/etc/open5gs/upf.yaml
4547
sed -i 's|UPF_ADVERTISE_IP|'$UPF_ADVERTISE_IP'|g' install/etc/open5gs/upf.yaml
4648
sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/upf.yaml
4749

0 commit comments

Comments
 (0)