Skip to content

Commit

Permalink
Merge pull request #142 from free5gc/release/v3-4-4
Browse files Browse the repository at this point in the history
feat: Release v3.4.4
  • Loading branch information
ianchen0119 authored Nov 12, 2024
2 parents ebdb217 + 26e5be1 commit bcb66e2
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ To start the core with a I-UPF and PSA-UPF ULCL configuration, use
docker compose -f docker-compose-ulcl.yaml up
```

> Note: This configuration have been tested using release [free5gc-compose v3.4.3](https://github.com/free5gc/free5gc-compose/tree/v3.4.3)
> Note: This configuration have been tested using release [free5gc-compose v3.4.4](https://github.com/free5gc/free5gc-compose/tree/v3.4.4)

Check out the used configuration files at `config/ULCL`.

Expand Down
74 changes: 37 additions & 37 deletions config/n3iwfcfg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,58 @@ info:
description: N3IWF initial local configuration

configuration:
N3IWFInformation:
GlobalN3IWFID: # ID used to globally identify an N3IWF
PLMNID: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
MCC: 208 # Mobile Country Code (3 digits string, digit: 0~9)
MNC: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
N3IWFID: 135 # ID used to identify an N3IWF in PLMN (uinteger, range: 0~65535)
Name: free5GC_N3IWF # The name of this N3IWF
SupportedTAList: # Tracking Area supported by this N3IWF
- TAC: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
BroadcastPLMNList: # Refer to TS 38.413
- PLMNID: # Public Land Mobile Network ID
MCC: 208 # Mobile Country Code (3 digits string, digit: 0~9)
MNC: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
TAISliceSupportList: # Network Slice supported in this TAI
- SNSSAI: # Single Network Slice Selection Assistance Information
SST: 1 # Slice/Service Type (1 byte hex string, range: 0~F)
SD: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
- SNSSAI: # Single Network Slice Selection Assistance Information
SST: 1 # Slice/Service Type (1 byte hex string, range: 0~F)
SD: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
n3iwfInformation:
globalN3IWFID: # ID used to globally identify an N3IWF
plmnID: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
n3iwfID: 135 # ID used to identify an N3IWF in PLMN (uinteger, range: 0~65535)
name: free5GC_N3IWF # The name of this N3IWF
supportedTAList: # Tracking Area supported by this N3IWF
- tac: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
broadcastPlmnList: # Refer to TS 38.413
- plmnID: # Public Land Mobile Network ID
mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
taiSliceSupportList: # Network Slice supported in this TAI
- snssai: # Single Network Slice Selection Assistance Information
sst: 1 # Slice/Service Type (1 byte hex string, range: 0~F)
sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
- snssai: # Single Network Slice Selection Assistance Information
sst: 1 # Slice/Service Type (1 byte hex string, range: 0~F)
sd: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)

# --- N2 Interfaces ---
AMFSCTPAddresses: # the IP list of N2 interfaces (SCTP) on AMF when using NGAP
- IP:
- amf.free5gc.org
Port: 38412
NASTCPPort: 20000 # TCP port which the NAS listens on
amfSCTPAddresses: # the IP list of N2 interfaces (SCTP) on AMF when using NGAP
- ip:
- amf.free5gc.org
port: 38412
nasTcpPort: 20000 # TCP port which the NAS listens on

# --- Nwu Interfaces ---
IKEBindAddress: 10.100.200.15 # Nwu interface IP address (IKE) on this N3IWF
IPSecTunnelAddress: 10.0.0.1 # Tunnel IP address of XFRM interface on this N3IWF
UEIPAddressRange: 10.0.0.0/24 # IP address pool allocated to UE in IPSec tunnel
XFRMInterfaceName: xfrmi # Prefix of XFRM interface name created by N3IWF
XFRMInterfaceID: 1 # XFRM interface if_id for IPSec routing (Any value except to 0, default value is 7 if not defined)
ikeBindAddress: 10.100.200.15 # Nwu interface IP address (IKE) on this N3IWF
ipSecTunnelAddress: 10.0.0.1 # Tunnel IP address of XFRM interface on this N3IWF
ueIpAddressRange: 10.0.0.0/24 # IP address pool allocated to UE in IPSec tunnel
xfrmInterfaceName: xfrmi # Prefix of XFRM interface name created by N3IWF
xfrmInterfaceID: 1 # XFRM interface if_id for IPSec routing (Any value except to 0, default value is 7 if not defined)

# --- N3 Interfaces ---
GTPBindAddress: 10.100.200.15 # IP address of N3 interface (GTP) on this N3IWF
n3iwfGtpBindAddress: 10.100.200.15 # IP address of N3 interface (GTP) on this N3IWF

FQDN: n3iwf.free5gc.org # FQDN of this N3IWF
fqdn: n3iwf.free5gc.org # FQDN of this N3IWF

# --- Security ---
PrivateKey: cert/n3iwf.key # Private key file path
CertificateAuthority: cert/n3iwf.pem # Certificate Authority (CA) file path
Certificate: cert/n3iwf.pem # Certificate file path
privateKey: cert/n3iwf.key # Private key file path
certificateAuthority: cert/n3iwf.pem # Certificate Authority (CA) file path
certificate: cert/n3iwf.pem # Certificate file path

# sending dead peer detection message
LivenessCheck:
livenessCheck:
enable: true # true or false
transFreq: 60s # frequency of transmission
maxRetryTimes: 4 # the max number of DPD response of UE

logger: # log output setting
enable: true # true or false
level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic
reportCaller: false # enable the caller report or not, value: true or false
reportCaller: false # enable the caller report or not, value: true or false
2 changes: 1 addition & 1 deletion docker-compose-ulcl-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ services:
command: ./nef -c ./config/nefcfg.yaml
expose:
- "8000"
volumes:
volumes:
- ./config/nefcfg.yaml:/free5gc/config/nefcfg.yaml
- ./cert:/free5gc/cert
environment:
Expand Down
28 changes: 14 additions & 14 deletions docker-compose-ulcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
free5gc-i-upf:
container_name: i-upf
image: free5gc/upf:v3.4.3
image: free5gc/upf:v3.4.4
command: bash -c "./upf-iptables.sh && ./upf -c ./config/upfcfg.yaml"
volumes:
- ./config/ULCL/upfcfg-i-upf.yaml:/free5gc/config/upfcfg.yaml
Expand All @@ -17,7 +17,7 @@ services:

free5gc-psa-upf:
container_name: psa-upf
image: free5gc/upf:v3.4.3
image: free5gc/upf:v3.4.4
command: bash -c "./upf-iptables.sh && ./upf -c ./config/upfcfg.yaml"
volumes:
- ./config/ULCL/upfcfg-psa-upf.yaml:/free5gc/config/upfcfg.yaml
Expand All @@ -44,7 +44,7 @@ services:

free5gc-nrf:
container_name: nrf
image: free5gc/nrf:v3.4.3
image: free5gc/nrf:v3.4.4
command: ./nrf -c ./config/nrfcfg.yaml
expose:
- "8000"
Expand All @@ -63,7 +63,7 @@ services:

free5gc-amf:
container_name: amf
image: free5gc/amf:v3.4.3
image: free5gc/amf:v3.4.4
command: ./amf -c ./config/amfcfg.yaml
expose:
- "8000"
Expand All @@ -81,7 +81,7 @@ services:

free5gc-ausf:
container_name: ausf
image: free5gc/ausf:v3.4.3
image: free5gc/ausf:v3.4.4
command: ./ausf -c ./config/ausfcfg.yaml
expose:
- "8000"
Expand All @@ -99,7 +99,7 @@ services:

free5gc-nssf:
container_name: nssf
image: free5gc/nssf:v3.4.3
image: free5gc/nssf:v3.4.4
command: ./nssf -c ./config/nssfcfg.yaml
expose:
- "8000"
Expand All @@ -117,7 +117,7 @@ services:

free5gc-pcf:
container_name: pcf
image: free5gc/pcf:v3.4.3
image: free5gc/pcf:v3.4.4
command: ./pcf -c ./config/pcfcfg.yaml
expose:
- "8000"
Expand All @@ -135,7 +135,7 @@ services:

free5gc-smf:
container_name: smf
image: free5gc/smf:v3.4.3
image: free5gc/smf:v3.4.4
command: ./smf -c ./config/smfcfg.yaml -u ./config/uerouting.yaml
expose:
- "8000"
Expand All @@ -156,7 +156,7 @@ services:

free5gc-udm:
container_name: udm
image: free5gc/udm:v3.4.3
image: free5gc/udm:v3.4.4
command: ./udm -c ./config/udmcfg.yaml
expose:
- "8000"
Expand All @@ -175,7 +175,7 @@ services:

free5gc-udr:
container_name: udr
image: free5gc/udr:v3.4.3
image: free5gc/udr:v3.4.4
command: ./udr -c ./config/udrcfg.yaml
expose:
- "8000"
Expand All @@ -195,7 +195,7 @@ services:

free5gc-chf:
container_name: chf
image: free5gc/chf:v3.4.3
image: free5gc/chf:v3.4.4
command: ./chf -c ./config/chfcfg.yaml
expose:
- "8000"
Expand All @@ -213,14 +213,14 @@ services:
- db
- free5gc-nrf
- free5gc-webui

free5gc-nef:
container_name: nef
image: free5gc/nef:latest
command: ./nef -c ./config/nefcfg.yaml
expose:
- "8000"
volumes:
volumes:
- ./config/nefcfg.yaml:/free5gc/config/nefcfg.yaml
- ./cert:/free5gc/cert
environment:
Expand All @@ -235,7 +235,7 @@ services:

free5gc-webui:
container_name: webui
image: free5gc/webui:v3.4.3
image: free5gc/webui:v3.4.4
command: ./webui -c ./config/webuicfg.yaml
expose:
- "2122"
Expand Down
26 changes: 13 additions & 13 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
free5gc-upf:
container_name: upf
image: free5gc/upf:v3.4.3
image: free5gc/upf:v3.4.4
command: bash -c "./upf-iptables.sh && ./upf -c ./config/upfcfg.yaml"
volumes:
- ./config/upfcfg.yaml:/free5gc/config/upfcfg.yaml
Expand All @@ -30,7 +30,7 @@ services:

free5gc-nrf:
container_name: nrf
image: free5gc/nrf:v3.4.3
image: free5gc/nrf:v3.4.4
command: ./nrf -c ./config/nrfcfg.yaml
expose:
- "8000"
Expand All @@ -49,7 +49,7 @@ services:

free5gc-amf:
container_name: amf
image: free5gc/amf:v3.4.3
image: free5gc/amf:v3.4.4
command: ./amf -c ./config/amfcfg.yaml
expose:
- "8000"
Expand All @@ -68,7 +68,7 @@ services:

free5gc-ausf:
container_name: ausf
image: free5gc/ausf:v3.4.3
image: free5gc/ausf:v3.4.4
command: ./ausf -c ./config/ausfcfg.yaml
expose:
- "8000"
Expand All @@ -86,7 +86,7 @@ services:

free5gc-nssf:
container_name: nssf
image: free5gc/nssf:v3.4.3
image: free5gc/nssf:v3.4.4
command: ./nssf -c ./config/nssfcfg.yaml
expose:
- "8000"
Expand All @@ -104,7 +104,7 @@ services:

free5gc-pcf:
container_name: pcf
image: free5gc/pcf:v3.4.3
image: free5gc/pcf:v3.4.4
command: ./pcf -c ./config/pcfcfg.yaml
expose:
- "8000"
Expand All @@ -122,7 +122,7 @@ services:

free5gc-smf:
container_name: smf
image: free5gc/smf:v3.4.3
image: free5gc/smf:v3.4.4
command: ./smf -c ./config/smfcfg.yaml -u ./config/uerouting.yaml
expose:
- "8000"
Expand All @@ -142,7 +142,7 @@ services:

free5gc-udm:
container_name: udm
image: free5gc/udm:v3.4.3
image: free5gc/udm:v3.4.4
command: ./udm -c ./config/udmcfg.yaml
expose:
- "8000"
Expand All @@ -161,7 +161,7 @@ services:

free5gc-udr:
container_name: udr
image: free5gc/udr:v3.4.3
image: free5gc/udr:v3.4.4
command: ./udr -c ./config/udrcfg.yaml
expose:
- "8000"
Expand All @@ -181,7 +181,7 @@ services:

free5gc-chf:
container_name: chf
image: free5gc/chf:v3.4.3
image: free5gc/chf:v3.4.4
command: ./chf -c ./config/chfcfg.yaml
expose:
- "8000"
Expand All @@ -202,7 +202,7 @@ services:

free5gc-n3iwf:
container_name: n3iwf
image: free5gc/n3iwf:v3.4.3
image: free5gc/n3iwf:v3.4.4
command: ./n3iwf -c ./config/n3iwfcfg.yaml
volumes:
- ./config/n3iwfcfg.yaml:/free5gc/config/n3iwfcfg.yaml
Expand Down Expand Up @@ -244,7 +244,7 @@ services:
command: ./nef -c ./config/nefcfg.yaml
expose:
- "8000"
volumes:
volumes:
- ./config/nefcfg.yaml:/free5gc/config/nefcfg.yaml
- ./cert:/free5gc/cert
environment:
Expand All @@ -259,7 +259,7 @@ services:

free5gc-webui:
container_name: webui
image: free5gc/webui:v3.4.3
image: free5gc/webui:v3.4.4
command: ./webui -c ./config/webuicfg.yaml
expose:
- "2121"
Expand Down

0 comments on commit bcb66e2

Please sign in to comment.