From 6c61015fd5596ba14df872af8c6e867ef4bc85eb Mon Sep 17 00:00:00 2001 From: Hossein Katebi Date: Wed, 24 Jan 2024 23:44:53 +0330 Subject: [PATCH] Migrated to open5gs `v2.7.0` (#276) --- .env | 3 ++ amf/amf.yaml | 40 ++++++++++++------------ amf/amf_init.sh | 1 + ausf/ausf.yaml | 26 +++++++--------- ausf/ausf_init.sh | 1 + base/Dockerfile | 2 +- bsf/bsf.yaml | 26 +++++++--------- bsf/bsf_init.sh | 1 + hss/hss.yaml | 4 +++ hss/hss_init.sh | 1 + mme/mme.yaml | 79 ++++++++++++++++++++++++----------------------- mme/mme_init.sh | 1 + nrf/nrf.yaml | 22 +++++++------ nrf/nrf_init.sh | 3 ++ nssf/nssf.yaml | 34 ++++++++++---------- nssf/nssf_init.sh | 1 + pcf/pcf.yaml | 31 +++++++++---------- pcf/pcf_init.sh | 1 + pcrf/pcrf.yaml | 4 +++ pcrf/pcrf_init.sh | 1 + scp/scp.yaml | 19 ++++++------ scp/scp_init.sh | 1 + sgwc/sgwc.yaml | 13 ++++---- sgwc/sgwc_init.sh | 1 + sgwu/sgwu.yaml | 18 +++++++---- sgwu/sgwu_init.sh | 1 + smf/smf.yaml | 59 ++++++++++++++++++----------------- smf/smf_4g.yaml | 36 ++++++++++++--------- smf/smf_init.sh | 1 + udm/udm.yaml | 26 +++++++--------- udm/udm_init.sh | 1 + udr/udr.yaml | 26 +++++++--------- udr/udr_init.sh | 1 + upf/upf.yaml | 34 +++++++++++--------- upf/upf_init.sh | 1 + 35 files changed, 283 insertions(+), 237 deletions(-) diff --git a/.env b/.env index daef540..5358edc 100644 --- a/.env +++ b/.env @@ -132,3 +132,6 @@ UE_IPV4_INTERNET=192.168.100.0/24 # UE IPv4 Subnet Range for APN=ims UE_IPV4_IMS=192.168.101.0/24 + +# Maximum Number of UEs +MAX_NUM_UE=1024 diff --git a/amf/amf.yaml b/amf/amf.yaml index 3adc2bd..63994e4 100644 --- a/amf/amf.yaml +++ b/amf/amf.yaml @@ -7,14 +7,25 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: amf: sbi: - - addr: AMF_IP - port: 7777 + server: + - address: AMF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 ngap: - - addr: AMF_IP + server: + - address: AMF_IP guami: - plmn_id: mcc: MCC @@ -40,21 +51,10 @@ amf: full: Open5GS amf_name: open5gs-amf0 metrics: - - addr: AMF_IP - port: 9091 + server: + - address: AMF_IP + port: 9091 + time: + t3512: + value: 540 -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 - -time: - t3512: - value: 540 diff --git a/amf/amf_init.sh b/amf/amf_init.sh index 6499de6..5a457f5 100755 --- a/amf/amf_init.sh +++ b/amf/amf_init.sh @@ -32,6 +32,7 @@ sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/amf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/amf.yaml sed -i 's|MNC|'$MNC'|g' install/etc/open5gs/amf.yaml sed -i 's|MCC|'$MCC'|g' install/etc/open5gs/amf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/amf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/ausf/ausf.yaml b/ausf/ausf.yaml index 59ecc74..cf33cd2 100644 --- a/ausf/ausf.yaml +++ b/ausf/ausf.yaml @@ -7,21 +7,19 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: ausf: sbi: - - addr: AUSF_IP - port: 7777 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: AUSF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 diff --git a/ausf/ausf_init.sh b/ausf/ausf_init.sh index fcf4919..d9d0704 100755 --- a/ausf/ausf_init.sh +++ b/ausf/ausf_init.sh @@ -30,6 +30,7 @@ cp /mnt/ausf/ausf.yaml install/etc/open5gs sed -i 's|AUSF_IP|'$AUSF_IP'|g' install/etc/open5gs/ausf.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/ausf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/ausf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/ausf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/base/Dockerfile b/base/Dockerfile index bd46c0f..72c19c0 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -68,7 +68,7 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg - # Get open5gs code and install RUN git clone --recursive https://github.com/open5gs/open5gs && cd open5gs && \ - git checkout tags/v2.6.6 && meson build --prefix=`pwd`/install && \ + git checkout tags/v2.7.0 && meson build --prefix=`pwd`/install && \ ninja -C build && cd build && ninja install && \ mkdir -p /open5gs/install/include diff --git a/bsf/bsf.yaml b/bsf/bsf.yaml index 1cc99ce..43e0dcf 100644 --- a/bsf/bsf.yaml +++ b/bsf/bsf.yaml @@ -9,21 +9,19 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: bsf: sbi: - - addr: BSF_IP - port: 7777 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: BSF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 diff --git a/bsf/bsf_init.sh b/bsf/bsf_init.sh index 7310c70..74930b7 100755 --- a/bsf/bsf_init.sh +++ b/bsf/bsf_init.sh @@ -33,6 +33,7 @@ sed -i 's|BSF_IP|'$BSF_IP'|g' install/etc/open5gs/bsf.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/bsf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/bsf.yaml sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/bsf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/bsf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/hss/hss.yaml b/hss/hss.yaml index 5dc56db..4dc95c4 100644 --- a/hss/hss.yaml +++ b/hss/hss.yaml @@ -3,6 +3,10 @@ db_uri: mongodb://MONGO_IP/open5gs logger: file: /open5gs/install/var/log/open5gs/hss.log +global: + max: + ue: MAX_NUM_UE + parameter: hss: diff --git a/hss/hss_init.sh b/hss/hss_init.sh index 29da25d..10f3be7 100755 --- a/hss/hss_init.sh +++ b/hss/hss_init.sh @@ -42,6 +42,7 @@ sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/hss.conf sed -i 's|LD_LIBRARY_PATH|'$LD_LIBRARY_PATH'|g' install/etc/freeDiameter/hss.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/make_certs.sh sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/hss.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/hss.yaml # Generate TLS certificates ./install/etc/freeDiameter/make_certs.sh install/etc/freeDiameter diff --git a/mme/mme.yaml b/mme/mme.yaml index dc1241d..0c2c18c 100644 --- a/mme/mme.yaml +++ b/mme/mme.yaml @@ -1,38 +1,50 @@ logger: file: /open5gs/install/var/log/open5gs/mme.log +global: + max: + ue: MAX_NUM_UE + parameter: mme: freeDiameter: /open5gs/install/etc/freeDiameter/mme.conf s1ap: - dev: MME_IF + server: + - dev: MME_IF gtpc: - dev: MME_IF + server: + - dev: MME_IF + client: + sgwc: + - address: SGWC_IP + smf: + - address: SMF_IP sgsap: - addr: OSMOMSC_IP - map: - tai: - plmn_id: - mcc: MCC - mnc: MNC - tac: 1 - lai: - plmn_id: - mcc: MCC - mnc: MNC - lac: 1 + server: + - address: OSMOMSC_IP + map: + tai: + plmn_id: + mcc: MCC + mnc: MNC + tac: 1 + lai: + plmn_id: + mcc: MCC + mnc: MNC + lac: 1 gummei: - plmn_id: - mcc: MCC - mnc: MNC - mme_gid: 2 - mme_code: 1 + - plmn_id: + mcc: MCC + mnc: MNC + mme_gid: 2 + mme_code: 1 tai: - plmn_id: - mcc: MCC - mnc: MNC - tac: 1 + - plmn_id: + mcc: MCC + mnc: MNC + tac: 1 security: integrity_order : [ EIA2, EIA1, EIA0 ] ciphering_order : [ EEA0, EEA1, EEA2 ] @@ -40,18 +52,9 @@ mme: full: Open5GS mme_name: open5gs-mme0 metrics: - - addr: MME_IP - port: 9091 - -sgwc: - gtpc: - addr: SGWC_IP - -smf: - gtpc: - - addr: - - SMF_IP - -time: - t3412: - value: 540 + server: + - address: MME_IP + port: 9091 + time: + t3412: + value: 540 diff --git a/mme/mme_init.sh b/mme/mme_init.sh index c7892e9..ade06b6 100755 --- a/mme/mme_init.sh +++ b/mme/mme_init.sh @@ -42,6 +42,7 @@ sed -i 's|MME_IF|'$IF_NAME'|g' install/etc/open5gs/mme.yaml sed -i 's|OSMOMSC_IP|'$OSMOMSC_IP'|g' install/etc/open5gs/mme.yaml sed -i 's|SGWC_IP|'$SGWC_IP'|g' install/etc/open5gs/mme.yaml sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/open5gs/mme.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/mme.yaml sed -i 's|MME_IP|'$MME_IP'|g' install/etc/freeDiameter/mme.conf sed -i 's|HSS_IP|'$HSS_IP'|g' install/etc/freeDiameter/mme.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/mme.conf diff --git a/nrf/nrf.yaml b/nrf/nrf.yaml index ff169da..046d4c1 100644 --- a/nrf/nrf.yaml +++ b/nrf/nrf.yaml @@ -7,16 +7,18 @@ sbi: client: no_tls: true -parameter: +global: + max: + ue: MAX_NUM_UE + +# parameter: nrf: + serving: # 5G roaming requires PLMN in NRF + - plmn_id: + mcc: MCC + mnc: MNC sbi: - addr: - - NRF_IP - port: 7777 - -scp: - sbi: - addr: - - SCP_IP - port: 7777 + server: + - address: NRF_IP + port: 7777 diff --git a/nrf/nrf_init.sh b/nrf/nrf_init.sh index 62fecaa..2854e1c 100755 --- a/nrf/nrf_init.sh +++ b/nrf/nrf_init.sh @@ -29,6 +29,9 @@ cp /mnt/nrf/nrf.yaml install/etc/open5gs sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/nrf.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/nrf.yaml +sed -i 's|MCC|'$MCC'|g' install/etc/open5gs/nrf.yaml +sed -i 's|MNC|'$MNC'|g' install/etc/open5gs/nrf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/nrf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/nssf/nssf.yaml b/nssf/nssf.yaml index f49bb81..4ae4918 100644 --- a/nssf/nssf.yaml +++ b/nssf/nssf.yaml @@ -7,26 +7,24 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: nssf: sbi: - - addr: NSSF_IP - port: 7777 - nsi: - - addr: NRF_IP - port: 7777 - s_nssai: - sst: 1 + server: + - address: NSSF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 + nsi: + - uri: http://NRF_IP:7777 + s_nssai: + sst: 1 -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 diff --git a/nssf/nssf_init.sh b/nssf/nssf_init.sh index f439877..3417de4 100755 --- a/nssf/nssf_init.sh +++ b/nssf/nssf_init.sh @@ -31,6 +31,7 @@ sed -i 's|NSSF_IP|'$NSSF_IP'|g' install/etc/open5gs/nssf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/nssf.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/nssf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/nssf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/nssf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/pcf/pcf.yaml b/pcf/pcf.yaml index 9aeb5c0..b7f19e2 100644 --- a/pcf/pcf.yaml +++ b/pcf/pcf.yaml @@ -9,24 +9,23 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: pcf: sbi: - - addr: PCF_IP - port: 7777 + server: + - address: PCF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 metrics: - - addr: PCF_IP - port: 9091 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: PCF_IP + port: 9091 diff --git a/pcf/pcf_init.sh b/pcf/pcf_init.sh index 9778047..afeaec6 100755 --- a/pcf/pcf_init.sh +++ b/pcf/pcf_init.sh @@ -33,6 +33,7 @@ sed -i 's|PCF_IP|'$PCF_IP'|g' install/etc/open5gs/pcf.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/pcf.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/pcf.yaml sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/pcf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/pcf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/pcrf/pcrf.yaml b/pcrf/pcrf.yaml index 46ae5b2..db54179 100644 --- a/pcrf/pcrf.yaml +++ b/pcrf/pcrf.yaml @@ -3,6 +3,10 @@ db_uri: mongodb://MONGO_IP/open5gs logger: file: /open5gs/install/var/log/open5gs/pcrf.log +global: + max: + ue: MAX_NUM_UE + parameter: pcrf: diff --git a/pcrf/pcrf_init.sh b/pcrf/pcrf_init.sh index a276507..a13ccb7 100755 --- a/pcrf/pcrf_init.sh +++ b/pcrf/pcrf_init.sh @@ -37,6 +37,7 @@ cp /mnt/pcrf/pcrf.conf install/etc/freeDiameter cp /mnt/pcrf/make_certs.sh install/etc/freeDiameter sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/pcrf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/pcrf.yaml sed -i 's|PCRF_IP|'$PCRF_IP'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/freeDiameter/pcrf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/pcrf.conf diff --git a/scp/scp.yaml b/scp/scp.yaml index 2a6f6af..eba3379 100644 --- a/scp/scp.yaml +++ b/scp/scp.yaml @@ -7,16 +7,17 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: scp: sbi: - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: SCP_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 diff --git a/scp/scp_init.sh b/scp/scp_init.sh index 3844a8c..8404377 100755 --- a/scp/scp_init.sh +++ b/scp/scp_init.sh @@ -29,6 +29,7 @@ cp /mnt/scp/scp.yaml install/etc/open5gs sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/scp.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/scp.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/scp.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/sgwc/sgwc.yaml b/sgwc/sgwc.yaml index 419f6d1..45b779c 100644 --- a/sgwc/sgwc.yaml +++ b/sgwc/sgwc.yaml @@ -5,10 +5,11 @@ parameter: sgwc: gtpc: - - addr: SGWC_IP + server: + - address: SGWC_IP pfcp: - - addr: SGWC_IP - -sgwu: - pfcp: - - addr: SGWU_IP + server: + - address: SGWC_IP + client: + sgwu: + - address: SGWU_IP diff --git a/sgwc/sgwc_init.sh b/sgwc/sgwc_init.sh index d88bedf..473cca0 100755 --- a/sgwc/sgwc_init.sh +++ b/sgwc/sgwc_init.sh @@ -31,6 +31,7 @@ export IF_NAME=$(ip r | awk '/default/ { print $5 }') cp /mnt/sgwc/sgwc.yaml install/etc/open5gs sed -i 's|SGWC_IP|'$SGWC_IP'|g' install/etc/open5gs/sgwc.yaml sed -i 's|SGWU_IP|'$SGWU_IP'|g' install/etc/open5gs/sgwc.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/sgwc.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/sgwu/sgwu.yaml b/sgwu/sgwu.yaml index bf84e41..7051e41 100644 --- a/sgwu/sgwu.yaml +++ b/sgwu/sgwu.yaml @@ -1,15 +1,21 @@ logger: file: /open5gs/install/var/log/open5gs/sgwu.log +global: + max: + ue: MAX_NUM_UE + parameter: sgwu: gtpu: - - addr: SGWU_IP - advertise: SGWU_ADVERTISE_IP + server: + - address: SGWU_IP + advertise: SGWU_ADVERTISE_IP pfcp: - - addr: SGWU_IP + server: + - address: SGWU_IP + client: + sgwc: + - address: SGWC_IP -sgwc: - pfcp: - - addr: SGWC_IP diff --git a/sgwu/sgwu_init.sh b/sgwu/sgwu_init.sh index 47e6f18..2cc2a73 100755 --- a/sgwu/sgwu_init.sh +++ b/sgwu/sgwu_init.sh @@ -32,6 +32,7 @@ cp /mnt/sgwu/sgwu.yaml install/etc/open5gs sed -i 's|SGWU_IP|'$SGWU_IP'|g' install/etc/open5gs/sgwu.yaml sed -i 's|SGWC_IP|'$SGWC_IP'|g' install/etc/open5gs/sgwu.yaml sed -i 's|SGWU_ADVERTISE_IP|'$SGWU_ADVERTISE_IP'|g' install/etc/open5gs/sgwu.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/sgwu.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/smf/smf.yaml b/smf/smf.yaml index 245f53b..9f38cdf 100644 --- a/smf/smf.yaml +++ b/smf/smf.yaml @@ -7,31 +7,47 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: no_ipv4v6_local_addr_in_packet_filter: true smf: freeDiameter: /open5gs/install/etc/freeDiameter/smf.conf sbi: - - addr: SMF_IP - port: 7777 + server: + - address: SMF_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 gtpc: - - addr: SMF_IP + server: + - address: SMF_IP gtpu: - - addr: SMF_IP + server: + - address: SMF_IP pfcp: - - addr: SMF_IP - subnet: - - addr: UE_IPV4_INTERNET_TUN_IP + server: + - address: SMF_IP + client: + upf: + - address: UPF_IP + session: + - subnet: UE_IPV4_INTERNET_TUN_IP dnn: internet dev: ogstun - - addr: 2001:230:cafe::1/48 - dev: ogstun + - subnet: 2001:230:cafe::1/48 dnn: internet - - addr: UE_IPV4_IMS_TUN_IP + dev: ogstun + - subnet: UE_IPV4_IMS_TUN_IP dnn: ims dev: ogstun2 - - addr: 2001:230:babe::1/48 + - subnet: 2001:230:babe::1/48 dnn: ims dev: ogstun2 dns: @@ -43,21 +59,6 @@ smf: - PCSCF_IP mtu: 1450 metrics: - - addr: SMF_IP - port: 9091 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 - -upf: - pfcp: - - addr: UPF_IP + server: + - address: SMF_IP + port: 9091 diff --git a/smf/smf_4g.yaml b/smf/smf_4g.yaml index 73974be..9b769fc 100644 --- a/smf/smf_4g.yaml +++ b/smf/smf_4g.yaml @@ -7,28 +7,38 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: no_ipv4v6_local_addr_in_packet_filter: true smf: freeDiameter: /open5gs/install/etc/freeDiameter/smf.conf gtpc: - - addr: SMF_IP + server: + - address: SMF_IP gtpu: - - addr: SMF_IP + server: + - address: SMF_IP pfcp: - - addr: SMF_IP - subnet: - - addr: UE_IPV4_INTERNET_TUN_IP + server: + - address: SMF_IP + client: + upf: + - address: UPF_IP + session: + - subnet: UE_IPV4_INTERNET_TUN_IP dnn: internet dev: ogstun - - addr: 2001:230:cafe::1/48 - dev: ogstun + - subnet: 2001:230:cafe::1/48 dnn: internet - - addr: UE_IPV4_IMS_TUN_IP + dev: ogstun + - subnet: UE_IPV4_IMS_TUN_IP dnn: ims dev: ogstun2 - - addr: 2001:230:babe::1/48 + - subnet: 2001:230:babe::1/48 dnn: ims dev: ogstun2 dns: @@ -40,9 +50,7 @@ smf: - PCSCF_IP mtu: 1450 metrics: - - addr: SMF_IP - port: 9091 + server: + - address: SMF_IP + port: 9091 -upf: - pfcp: - - addr: UPF_IP diff --git a/smf/smf_init.sh b/smf/smf_init.sh index 0105f6f..67ae9bc 100755 --- a/smf/smf_init.sh +++ b/smf/smf_init.sh @@ -53,6 +53,7 @@ sed -i 's|SMF_DNS2|'$SMF_DNS2'|g' install/etc/open5gs/smf.yaml sed -i 's|UE_IPV4_INTERNET_TUN_IP|'$UE_IPV4_INTERNET_TUN_IP'|g' install/etc/open5gs/smf.yaml sed -i 's|UE_IPV4_IMS_TUN_IP|'$UE_IPV4_IMS_TUN_IP'|g' install/etc/open5gs/smf.yaml sed -i 's|PCSCF_IP|'$PCSCF_IP'|g' install/etc/open5gs/smf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/smf.yaml sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/freeDiameter/smf.conf sed -i 's|PCRF_IP|'$PCRF_IP'|g' install/etc/freeDiameter/smf.conf sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' install/etc/freeDiameter/smf.conf diff --git a/udm/udm.yaml b/udm/udm.yaml index 6665406..2e3273b 100644 --- a/udm/udm.yaml +++ b/udm/udm.yaml @@ -7,6 +7,10 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + parameter: udm: @@ -18,17 +22,11 @@ udm: scheme: 2 key: /open5gs/install/etc/open5gs/hnet/secp256r1-2.key sbi: - - addr: UDM_IP - port: 7777 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: UDM_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 diff --git a/udm/udm_init.sh b/udm/udm_init.sh index f48c7a4..fbfab15 100755 --- a/udm/udm_init.sh +++ b/udm/udm_init.sh @@ -30,6 +30,7 @@ cp /mnt/udm/udm.yaml install/etc/open5gs sed -i 's|UDM_IP|'$UDM_IP'|g' install/etc/open5gs/udm.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/udm.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/udm.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/udm.yaml cp /mnt/udm/curve25519-1.key install/etc/open5gs/hnet cp /mnt/udm/secp256r1-2.key install/etc/open5gs/hnet diff --git a/udr/udr.yaml b/udr/udr.yaml index 932806d..73aefe3 100644 --- a/udr/udr.yaml +++ b/udr/udr.yaml @@ -6,6 +6,10 @@ sbi: client: no_tls: true +global: + max: + ue: MAX_NUM_UE + logger: file: /open5gs/install/var/log/open5gs/udr.log @@ -13,17 +17,11 @@ parameter: udr: sbi: - - addr: UDR_IP - port: 7777 - -scp: - sbi: - - addr: - - SCP_IP - port: 7777 - -nrf: - sbi: - - addr: - - NRF_IP - port: 7777 + server: + - address: UDR_IP + port: 7777 + client: + nrf: + - uri: http://NRF_IP:7777 + scp: + - uri: http://SCP_IP:7777 diff --git a/udr/udr_init.sh b/udr/udr_init.sh index a691fb5..6099a20 100755 --- a/udr/udr_init.sh +++ b/udr/udr_init.sh @@ -33,6 +33,7 @@ sed -i 's|UDR_IP|'$UDR_IP'|g' install/etc/open5gs/udr.yaml sed -i 's|SCP_IP|'$SCP_IP'|g' install/etc/open5gs/udr.yaml sed -i 's|NRF_IP|'$NRF_IP'|g' install/etc/open5gs/udr.yaml sed -i 's|MONGO_IP|'$MONGO_IP'|g' install/etc/open5gs/udr.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/udr.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/upf/upf.yaml b/upf/upf.yaml index bed4f41..7b9798d 100644 --- a/upf/upf.yaml +++ b/upf/upf.yaml @@ -1,31 +1,37 @@ logger: file: /open5gs/install/var/log/open5gs/upf.log +global: + max: + ue: MAX_NUM_UE + parameter: upf: pfcp: - - addr: UPF_IP + server: + - address: UPF_IP + client: + smf: + - address: SMF_IP gtpu: - - addr: UPF_IP - advertise: UPF_ADVERTISE_IP - subnet: - - addr: UE_IPV4_INTERNET_TUN_IP + server: + - address: UPF_IP + advertise: UPF_ADVERTISE_IP + session: + - subnet: UE_IPV4_INTERNET_TUN_IP dev: ogstun dnn: internet - - addr: 2001:230:cafe::1/48 + - subnet: 2001:230:cafe::1/48 dev: ogstun dnn: internet - - addr: UE_IPV4_IMS_TUN_IP + - subnet: UE_IPV4_IMS_TUN_IP dnn: ims dev: ogstun2 - - addr: 2001:230:babe::1/48 + - subnet: 2001:230:babe::1/48 dnn: ims dev: ogstun2 metrics: - - addr: UPF_IP - port: 9091 - -smf: - pfcp: - - addr: SMF_IP + server: + - address: UPF_IP + port: 9091 diff --git a/upf/upf_init.sh b/upf/upf_init.sh index 3512410..d72ef61 100755 --- a/upf/upf_init.sh +++ b/upf/upf_init.sh @@ -43,6 +43,7 @@ sed -i 's|SMF_IP|'$SMF_IP'|g' install/etc/open5gs/upf.yaml sed -i 's|UE_IPV4_INTERNET_TUN_IP|'$UE_IPV4_INTERNET_TUN_IP'|g' install/etc/open5gs/upf.yaml sed -i 's|UE_IPV4_IMS_TUN_IP|'$UE_IPV4_IMS_TUN_IP'|g' install/etc/open5gs/upf.yaml sed -i 's|UPF_ADVERTISE_IP|'$UPF_ADVERTISE_IP'|g' install/etc/open5gs/upf.yaml +sed -i 's|MAX_NUM_UE|'$MAX_NUM_UE'|g' install/etc/open5gs/upf.yaml # Sync docker time #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone