From 0be022935f29723b3e3a854ade2a0557885593f3 Mon Sep 17 00:00:00 2001 From: "Grings, Felipe" <> Date: Sat, 18 Nov 2023 16:53:55 -0300 Subject: [PATCH] Add NFs config.yaml as a independent file --- charts/free5gc/charts/free5gc-amf/config.yaml | 93 ++++++++ .../free5gc-amf/templates/amf-configmap.yaml | 3 +- charts/free5gc/charts/free5gc-amf/values.yaml | 95 -------- .../free5gc/charts/free5gc-ausf/config.yaml | 7 + .../templates/ausf-configmap.yaml | 3 +- .../free5gc/charts/free5gc-ausf/values.yaml | 8 - .../free5gc/charts/free5gc-n3iwf/config.yaml | 44 ++++ .../templates/n3iwf-configmap.yaml | 3 +- .../free5gc/charts/free5gc-n3iwf/values.yaml | 46 ---- charts/free5gc/charts/free5gc-nrf/config.yaml | 3 + .../free5gc-nrf/templates/nrf-configmap.yaml | 3 +- charts/free5gc/charts/free5gc-nrf/values.yaml | 4 - .../free5gc/charts/free5gc-nssf/config.yaml | 208 +++++++++++++++++ .../templates/nssf-configmap.yaml | 3 +- .../free5gc/charts/free5gc-nssf/values.yaml | 209 ------------------ charts/free5gc/charts/free5gc-pcf/config.yaml | 4 + .../free5gc-pcf/templates/pcf-configmap.yaml | 3 +- charts/free5gc/charts/free5gc-pcf/values.yaml | 5 - charts/free5gc/charts/free5gc-smf/config.yaml | 76 +++++++ .../free5gc-smf/templates/smf-configmap.yaml | 3 +- charts/free5gc/charts/free5gc-smf/values.yaml | 78 ------- charts/free5gc/charts/free5gc-udm/config.yaml | 9 + .../free5gc-udm/templates/udm-configmap.yaml | 3 +- charts/free5gc/charts/free5gc-udm/values.yaml | 10 - 24 files changed, 452 insertions(+), 471 deletions(-) create mode 100644 charts/free5gc/charts/free5gc-amf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-ausf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-n3iwf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-nrf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-nssf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-pcf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-smf/config.yaml create mode 100644 charts/free5gc/charts/free5gc-udm/config.yaml diff --git a/charts/free5gc/charts/free5gc-amf/config.yaml b/charts/free5gc/charts/free5gc-amf/config.yaml new file mode 100644 index 00000000..2363731a --- /dev/null +++ b/charts/free5gc/charts/free5gc-amf/config.yaml @@ -0,0 +1,93 @@ +amfName: AMF +serviceNameList: + - namf-comm + - namf-evts + - namf-mt + - namf-loc + - namf-oam +servedGuamiList: + - plmnId: + mcc: 208 + mnc: 93 + amfId: cafe00 +supportTaiList: + - plmnId: + mcc: 208 + mnc: 93 + tac: 000001 +plmnSupportList: + - plmnId: + mcc: 208 + mnc: 93 + snssaiList: + - sst: 1 + sd: 010203 + - sst: 1 + sd: 112233 +supportDnnList: + - internet +security: + integrityOrder: + - NIA2 + cipheringOrder: + - NEA0 +networkName: + full: free5GC + short: free +ngapIE: # Optional NGAP IEs + mobilityRestrictionList: # Mobility Restriction List IE, refer to TS 38.413 + enable: true # append this IE in related message or not + maskedIMEISV: # Masked IMEISV IE, refer to TS 38.413 + enable: true # append this IE in related message or not + redirectionVoiceFallback: # Redirection Voice Fallback IE, refer to TS 38.413 + enable: false # append this IE in related message or not +nasIE: # Optional NAS IEs + networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501 + enable: true # append this IE in Registration accept or not + length: 1 # IE content length (uinteger, range: 1~3) + imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1) + emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3) + emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3) + iwkN26: 0 # Interworking without N26 interface indicator (uinteger, range: 0~1) + mpsi: 0 # MPS indicator (uinteger, range: 0~1) + emcN3: 0 # Emergency service support indicator for Non-3GPP access (uinteger, range: 0~1) + mcsi: 0 # MCS indicator (uinteger, range: 0~1) +t3502Value: 720 +t3512Value: 3600 +non3gppDeregTimerValue: 3240 +# retransmission timer for paging message +t3513: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +# retransmission timer for NAS Registration Accept message +t3522: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +# retransmission timer for NAS Registration Accept message +t3550: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +# retransmission timer for NAS Authentication Request/Security Mode Command message +t3560: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +# retransmission timer for NAS Notification message +t3565: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +t3570: + enable: true # true or false + expireTime: 6s # default is 6 seconds + maxRetryTimes: 4 # the max number of retransmission +locality: area1 # Name of the location where a set of AMF, SMF, PCF and UPFs are located +sctp: # set the sctp server setting , once this field is set, please also add maxInputStream, maxOsStream, maxAttempts, maxInitTimeOut + numOstreams: 3 # the maximum out streams of each sctp connection + maxInstreams: 5 # the maximum in streams of each sctp connection + maxAttempts: 2 # the maximum attempts of each sctp connection + maxInitTimeout: 2 # the maximum init timeout of each sctp connection +defaultUECtxReq: false # the default value of UE Context Request to decide when triggering Initial Context Setup procedure diff --git a/charts/free5gc/charts/free5gc-amf/templates/amf-configmap.yaml b/charts/free5gc/charts/free5gc-amf/templates/amf-configmap.yaml index adf88d77..c0f46ec4 100644 --- a/charts/free5gc/charts/free5gc-amf/templates/amf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-amf/templates/amf-configmap.yaml @@ -45,8 +45,7 @@ data: nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-amf/values.yaml b/charts/free5gc/charts/free5gc-amf/values.yaml index befbd3a1..2116f152 100644 --- a/charts/free5gc/charts/free5gc-amf/values.yaml +++ b/charts/free5gc/charts/free5gc-amf/values.yaml @@ -119,101 +119,6 @@ amf: - namf-mt - namf-loc - namf-oam - configuration: |- - amfName: AMF - serviceNameList: - - namf-comm - - namf-evts - - namf-mt - - namf-loc - - namf-oam - servedGuamiList: - - plmnId: - mcc: 208 - mnc: 93 - amfId: cafe00 - supportTaiList: - - plmnId: - mcc: 208 - mnc: 93 - tac: 000001 - plmnSupportList: - - plmnId: - mcc: 208 - mnc: 93 - snssaiList: - - sst: 1 - sd: 010203 - - sst: 1 - sd: 112233 - supportDnnList: - - internet - security: - integrityOrder: - - NIA2 - cipheringOrder: - - NEA0 - networkName: - full: free5GC - short: free - ngapIE: # Optional NGAP IEs - mobilityRestrictionList: # Mobility Restriction List IE, refer to TS 38.413 - enable: true # append this IE in related message or not - maskedIMEISV: # Masked IMEISV IE, refer to TS 38.413 - enable: true # append this IE in related message or not - redirectionVoiceFallback: # Redirection Voice Fallback IE, refer to TS 38.413 - enable: false # append this IE in related message or not - nasIE: # Optional NAS IEs - networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501 - enable: true # append this IE in Registration accept or not - length: 1 # IE content length (uinteger, range: 1~3) - imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1) - emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3) - emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3) - iwkN26: 0 # Interworking without N26 interface indicator (uinteger, range: 0~1) - mpsi: 0 # MPS indicator (uinteger, range: 0~1) - emcN3: 0 # Emergency service support indicator for Non-3GPP access (uinteger, range: 0~1) - mcsi: 0 # MCS indicator (uinteger, range: 0~1) - t3502Value: 720 - t3512Value: 3600 - non3gppDeregTimerValue: 3240 - # retransmission timer for paging message - t3513: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - # retransmission timer for NAS Registration Accept message - t3522: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - # retransmission timer for NAS Registration Accept message - t3550: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - # retransmission timer for NAS Authentication Request/Security Mode Command message - t3560: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - # retransmission timer for NAS Notification message - t3565: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - t3570: - enable: true # true or false - expireTime: 6s # default is 6 seconds - maxRetryTimes: 4 # the max number of retransmission - locality: area1 # Name of the location where a set of AMF, SMF, PCF and UPFs are located - sctp: # set the sctp server setting , once this field is set, please also add maxInputStream, maxOsStream, maxAttempts, maxInitTimeOut - numOstreams: 3 # the maximum out streams of each sctp connection - maxInstreams: 5 # the maximum in streams of each sctp connection - maxAttempts: 2 # the maximum attempts of each sctp connection - maxInitTimeout: 2 # the maximum init timeout of each sctp connection - defaultUECtxReq: false # the default value of UE Context Request to decide when triggering Initial Context Setup procedure - logger: # log output setting enable: true # true or false level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic diff --git a/charts/free5gc/charts/free5gc-ausf/config.yaml b/charts/free5gc/charts/free5gc-ausf/config.yaml new file mode 100644 index 00000000..9cfc04af --- /dev/null +++ b/charts/free5gc/charts/free5gc-ausf/config.yaml @@ -0,0 +1,7 @@ +plmnSupportList: + - mcc: 208 + mnc: 93 + - mcc: 123 + mnc: 45 +groupId: ausfGroup001 +eapAkaSupiImsiPrefix: false diff --git a/charts/free5gc/charts/free5gc-ausf/templates/ausf-configmap.yaml b/charts/free5gc/charts/free5gc-ausf/templates/ausf-configmap.yaml index fe474394..bcef6188 100644 --- a/charts/free5gc/charts/free5gc-ausf/templates/ausf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-ausf/templates/ausf-configmap.yaml @@ -38,8 +38,7 @@ data: nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-ausf/values.yaml b/charts/free5gc/charts/free5gc-ausf/values.yaml index 7a928769..0f0d742e 100644 --- a/charts/free5gc/charts/free5gc-ausf/values.yaml +++ b/charts/free5gc/charts/free5gc-ausf/values.yaml @@ -93,14 +93,6 @@ ausf: configuration: serviceNameList: |- - nausf-auth - configuration: |- - plmnSupportList: - - mcc: 208 - mnc: 93 - - mcc: 123 - mnc: 45 - groupId: ausfGroup001 - eapAkaSupiImsiPrefix: false # the kind of log output # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic # ReportCaller: enable the caller report or not, value: true or false diff --git a/charts/free5gc/charts/free5gc-n3iwf/config.yaml b/charts/free5gc/charts/free5gc-n3iwf/config.yaml new file mode 100644 index 00000000..156cdda3 --- /dev/null +++ b/charts/free5gc/charts/free5gc-n3iwf/config.yaml @@ -0,0 +1,44 @@ +N3IWFInformation: + GlobalN3IWFID: + PLMNID: + MCC: 208 + MNC: 93 + N3IWFID: 135 + Name: + free5GC_N3IWF + SupportedTAList: + - TAC: 000001 + BroadcastPLMNList: + - PLMNID: + MCC: 208 + MNC: 93 + TAISliceSupportList: + - SNSSAI: + SST: 1 + SD: 010203 + - SNSSAI: + SST: 1 + SD: 112233 + +# IPSec virtual interface +IPSecInterfaceAddress: 10.0.0.1 + +# IPSec virtual interface mark +IPSecInterfaceMark: 5 + +# NAS TCP Listen Port +NASTCPPort: 20000 + +# N3IWF FQDN +FQDN: n3iwf.free5gc.org + +# Security +# Private Key File Path +PrivateKey: ../cert/n3iwf.key +# Certificate Authority (CA) +CertificateAuthority: ../cert/n3iwf.pem +# Certificate +Certificate: ../cert/n3iwf.pem + +# IP address that will be allocated to UE in IPSec tunnel +UEIPAddressRange: 10.0.0.0/24 diff --git a/charts/free5gc/charts/free5gc-n3iwf/templates/n3iwf-configmap.yaml b/charts/free5gc/charts/free5gc-n3iwf/templates/n3iwf-configmap.yaml index e770e6a4..9ec1c773 100644 --- a/charts/free5gc/charts/free5gc-n3iwf/templates/n3iwf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-n3iwf/templates/n3iwf-configmap.yaml @@ -41,8 +41,7 @@ data: # GTP interface GTPBindAddress: {{ .n3if.ipAddress }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-n3iwf/values.yaml b/charts/free5gc/charts/free5gc-n3iwf/values.yaml index 37c0cdde..1e47952e 100644 --- a/charts/free5gc/charts/free5gc-n3iwf/values.yaml +++ b/charts/free5gc/charts/free5gc-n3iwf/values.yaml @@ -104,52 +104,6 @@ n3iwf: configuration: IPSecInterfaceAddress: 10.0.0.1 - configuration: |- - N3IWFInformation: - GlobalN3IWFID: - PLMNID: - MCC: 208 - MNC: 93 - N3IWFID: 135 - Name: - free5GC_N3IWF - SupportedTAList: - - TAC: 000001 - BroadcastPLMNList: - - PLMNID: - MCC: 208 - MNC: 93 - TAISliceSupportList: - - SNSSAI: - SST: 1 - SD: 010203 - - SNSSAI: - SST: 1 - SD: 112233 - - # IPSec virtual interface - IPSecInterfaceAddress: 10.0.0.1 - - # IPSec virtual interface mark - IPSecInterfaceMark: 5 - - # NAS TCP Listen Port - NASTCPPort: 20000 - - # N3IWF FQDN - FQDN: n3iwf.free5gc.org - - # Security - # Private Key File Path - PrivateKey: ../cert/n3iwf.key - # Certificate Authority (CA) - CertificateAuthority: ../cert/n3iwf.pem - # Certificate - Certificate: ../cert/n3iwf.pem - - # IP address that will be allocated to UE in IPSec tunnel - UEIPAddressRange: 10.0.0.0/24 - # the kind of log output # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic # ReportCaller: enable the caller report or not, value: true or false diff --git a/charts/free5gc/charts/free5gc-nrf/config.yaml b/charts/free5gc/charts/free5gc-nrf/config.yaml new file mode 100644 index 00000000..af607976 --- /dev/null +++ b/charts/free5gc/charts/free5gc-nrf/config.yaml @@ -0,0 +1,3 @@ +DefaultPlmnId: + mcc: 208 + mnc: 93 diff --git a/charts/free5gc/charts/free5gc-nrf/templates/nrf-configmap.yaml b/charts/free5gc/charts/free5gc-nrf/templates/nrf-configmap.yaml index eb331545..d9975fb9 100644 --- a/charts/free5gc/charts/free5gc-nrf/templates/nrf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-nrf/templates/nrf-configmap.yaml @@ -39,8 +39,7 @@ data: key: ../cert/nrf.key pem: ../cert/nrf.pem - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-nrf/values.yaml b/charts/free5gc/charts/free5gc-nrf/values.yaml index a559c083..565112c9 100644 --- a/charts/free5gc/charts/free5gc-nrf/values.yaml +++ b/charts/free5gc/charts/free5gc-nrf/values.yaml @@ -108,10 +108,6 @@ nrf: serviceNameList: |- - nnrf-nfm - nnrf-disc - configuration: |- - DefaultPlmnId: - mcc: 208 - mnc: 93 logger: # log output setting enable: true # true or false level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic diff --git a/charts/free5gc/charts/free5gc-nssf/config.yaml b/charts/free5gc/charts/free5gc-nssf/config.yaml new file mode 100644 index 00000000..5ad47d37 --- /dev/null +++ b/charts/free5gc/charts/free5gc-nssf/config.yaml @@ -0,0 +1,208 @@ +nssfName: NSSF +supportedPlmnList: + - mcc: 208 + mnc: 93 +supportedNssaiInPlmnList: + - plmnId: + mcc: 208 + mnc: 93 + supportedSnssaiList: + - sst: 1 + sd: 010203 + - sst: 1 + sd: 112233 + - sst: 1 + sd: 3 + - sst: 2 + sd: 1 + - sst: 2 + sd: 2 +amfList: + - nfId: 469de254-2fe5-4ca0-8381-af3f500af77c + supportedNssaiAvailabilityData: + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33456 + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 2 + - sst: 2 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33457 + supportedSnssaiList: + - sst: 1 + sd: 1 + - sst: 1 + sd: 2 + - nfId: fbe604a8-27b2-417e-bd7c-8a7be2691f8d + supportedNssaiAvailabilityData: + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33458 + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 1 + sd: 3 + - sst: 2 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33459 + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 2 + - sst: 2 + sd: 1 + - nfId: b9e6e2cb-5ce8-4cb6-9173-a266dd9a2f0c + supportedNssaiAvailabilityData: + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33456 + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 1 + sd: 2 + - sst: 2 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33458 + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 2 + - sst: 2 + sd: 1 +taList: + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33456 + accessType: 3GPP_ACCESS + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 1 + sd: 2 + - sst: 2 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33457 + accessType: 3GPP_ACCESS + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 1 + sd: 2 + - sst: 2 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33458 + accessType: 3GPP_ACCESS + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 1 + sd: 3 + - sst: 2 + restrictedSnssaiList: + - homePlmnId: + mcc: 310 + mnc: 560 + sNssaiList: + - sst: 1 + sd: 3 + - tai: + plmnId: + mcc: 466 + mnc: 92 + tac: 33459 + accessType: 3GPP_ACCESS + supportedSnssaiList: + - sst: 1 + - sst: 1 + sd: 1 + - sst: 2 + - sst: 2 + sd: 1 + restrictedSnssaiList: + - homePlmnId: + mcc: 310 + mnc: 560 + sNssaiList: + - sst: 2 + sd: 1 +mappingListFromPlmn: + - operatorName: NTT Docomo + homePlmnId: + mcc: 440 + mnc: 10 + mappingOfSnssai: + - servingSnssai: + sst: 1 + sd: 1 + homeSnssai: + sst: 1 + sd: 1 + - servingSnssai: + sst: 1 + sd: 2 + homeSnssai: + sst: 1 + sd: 3 + - servingSnssai: + sst: 1 + sd: 3 + homeSnssai: + sst: 1 + sd: 4 + - servingSnssai: + sst: 2 + sd: 1 + homeSnssai: + sst: 2 + sd: 2 + - operatorName: AT&T Mobility + homePlmnId: + mcc: 310 + mnc: 560 + mappingOfSnssai: + - servingSnssai: + sst: 1 + sd: 1 + homeSnssai: + sst: 1 + sd: 2 + - servingSnssai: + sst: 1 + sd: 2 + homeSnssai: + sst: 1 + sd: 3 diff --git a/charts/free5gc/charts/free5gc-nssf/templates/nssf-configmap.yaml b/charts/free5gc/charts/free5gc-nssf/templates/nssf-configmap.yaml index 8313637f..6bcc0e03 100644 --- a/charts/free5gc/charts/free5gc-nssf/templates/nssf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-nssf/templates/nssf-configmap.yaml @@ -139,8 +139,7 @@ data: sd: 1 - sst: 2 - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-nssf/values.yaml b/charts/free5gc/charts/free5gc-nssf/values.yaml index 0837c1a0..ea2752af 100644 --- a/charts/free5gc/charts/free5gc-nssf/values.yaml +++ b/charts/free5gc/charts/free5gc-nssf/values.yaml @@ -94,215 +94,6 @@ nssf: serviceNameList: |- - nnssf-nsselection - nnssf-nssaiavailability - configuration: |- - nssfName: NSSF - supportedPlmnList: - - mcc: 208 - mnc: 93 - supportedNssaiInPlmnList: - - plmnId: - mcc: 208 - mnc: 93 - supportedSnssaiList: - - sst: 1 - sd: 010203 - - sst: 1 - sd: 112233 - - sst: 1 - sd: 3 - - sst: 2 - sd: 1 - - sst: 2 - sd: 2 - amfList: - - nfId: 469de254-2fe5-4ca0-8381-af3f500af77c - supportedNssaiAvailabilityData: - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33456 - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 2 - - sst: 2 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33457 - supportedSnssaiList: - - sst: 1 - sd: 1 - - sst: 1 - sd: 2 - - nfId: fbe604a8-27b2-417e-bd7c-8a7be2691f8d - supportedNssaiAvailabilityData: - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33458 - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 1 - sd: 3 - - sst: 2 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33459 - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 2 - - sst: 2 - sd: 1 - - nfId: b9e6e2cb-5ce8-4cb6-9173-a266dd9a2f0c - supportedNssaiAvailabilityData: - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33456 - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 1 - sd: 2 - - sst: 2 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33458 - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 2 - - sst: 2 - sd: 1 - taList: - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33456 - accessType: 3GPP_ACCESS - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 1 - sd: 2 - - sst: 2 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33457 - accessType: 3GPP_ACCESS - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 1 - sd: 2 - - sst: 2 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33458 - accessType: 3GPP_ACCESS - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 1 - sd: 3 - - sst: 2 - restrictedSnssaiList: - - homePlmnId: - mcc: 310 - mnc: 560 - sNssaiList: - - sst: 1 - sd: 3 - - tai: - plmnId: - mcc: 466 - mnc: 92 - tac: 33459 - accessType: 3GPP_ACCESS - supportedSnssaiList: - - sst: 1 - - sst: 1 - sd: 1 - - sst: 2 - - sst: 2 - sd: 1 - restrictedSnssaiList: - - homePlmnId: - mcc: 310 - mnc: 560 - sNssaiList: - - sst: 2 - sd: 1 - mappingListFromPlmn: - - operatorName: NTT Docomo - homePlmnId: - mcc: 440 - mnc: 10 - mappingOfSnssai: - - servingSnssai: - sst: 1 - sd: 1 - homeSnssai: - sst: 1 - sd: 1 - - servingSnssai: - sst: 1 - sd: 2 - homeSnssai: - sst: 1 - sd: 3 - - servingSnssai: - sst: 1 - sd: 3 - homeSnssai: - sst: 1 - sd: 4 - - servingSnssai: - sst: 2 - sd: 1 - homeSnssai: - sst: 2 - sd: 2 - - operatorName: AT&T Mobility - homePlmnId: - mcc: 310 - mnc: 560 - mappingOfSnssai: - - servingSnssai: - sst: 1 - sd: 1 - homeSnssai: - sst: 1 - sd: 2 - - servingSnssai: - sst: 1 - sd: 2 - homeSnssai: - sst: 1 - sd: 3 # the kind of log output # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic # ReportCaller: enable the caller report or not, value: true or false diff --git a/charts/free5gc/charts/free5gc-pcf/config.yaml b/charts/free5gc/charts/free5gc-pcf/config.yaml new file mode 100644 index 00000000..62df6361 --- /dev/null +++ b/charts/free5gc/charts/free5gc-pcf/config.yaml @@ -0,0 +1,4 @@ +pcfName: PCF +timeFormat: 2019-01-02 15:04:05 +defaultBdtRefId: BdtPolicyId- +locality: area1 diff --git a/charts/free5gc/charts/free5gc-pcf/templates/pcf-configmap.yaml b/charts/free5gc/charts/free5gc-pcf/templates/pcf-configmap.yaml index 19769bd6..fee67292 100644 --- a/charts/free5gc/charts/free5gc-pcf/templates/pcf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-pcf/templates/pcf-configmap.yaml @@ -42,8 +42,7 @@ data: nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-pcf/values.yaml b/charts/free5gc/charts/free5gc-pcf/values.yaml index a5d4008e..c75092af 100644 --- a/charts/free5gc/charts/free5gc-pcf/values.yaml +++ b/charts/free5gc/charts/free5gc-pcf/values.yaml @@ -108,11 +108,6 @@ pcf: suppFeat: 3 - serviceName: npcf-eventexposure - serviceName: npcf-ue-policy-control - configuration: |- - pcfName: PCF - timeFormat: 2019-01-02 15:04:05 - defaultBdtRefId: BdtPolicyId- - locality: area1 # the kind of log output # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic # ReportCaller: enable the caller report or not, value: true or false diff --git a/charts/free5gc/charts/free5gc-smf/config.yaml b/charts/free5gc/charts/free5gc-smf/config.yaml new file mode 100644 index 00000000..67e6090c --- /dev/null +++ b/charts/free5gc/charts/free5gc-smf/config.yaml @@ -0,0 +1,76 @@ +smfName: SMF +snssaiInfos: + - sNssai: + sst: 1 + sd: 010203 + dnnInfos: # DNN information list + - dnn: internet # Data Network Name + dns: # the IP address of DNS + ipv4: 8.8.8.8 + ipv6: 2001:4860:4860::8888 + - sNssai: + sst: 1 + sd: 112233 + dnnInfos: # DNN information list + - dnn: internet # Data Network Name + dns: # the IP address of DNS + ipv4: 8.8.8.8 + ipv6: 2001:4860:4860::8888 + - sNssai: + sst: 2 + sd: 112234 + dnnInfos: + - dnn: internet + dns: + ipv4: 8.8.8.8 + ipv6: 2001:4860:4860::8888 +plmnList: # the list of PLMN IDs that this SMF belongs to (optional, remove this key when unnecessary) + - mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9) + mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9) +userplaneInformation: # list of userplane information + upNodes: # information of userplane node (AN or UPF) + gNB1: # the name of the node + type: AN # the type of the node (AN or UPF) + UPF: # the name of the node + type: UPF # the type of the node (AN or UPF) + nodeID: 10.100.50.241 # the IP/FQDN of N4 interface on this UPF (PFCP) + addr: 10.100.50.241 # the IP/FQDN of N4 interface on this UPF (PFCP) + sNssaiUpfInfos: # S-NSSAI information list for this UPF + - sNssai: # S-NSSAI (Single Network Slice Selection Assistance Information) + sst: 1 # Slice/Service Type (uinteger, range: 0~255) + sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF) + dnnUpfInfoList: # DNN information list for this S-NSSAI + - dnn: internet + pools: + - cidr: 10.1.0.0/17 + staticPools: + - cidr: 10.1.64.0/24 + - sNssai: # S-NSSAI (Single Network Slice Selection Assistance Information) + sst: 1 # Slice/Service Type (uinteger, range: 0~255) + sd: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF) + dnnUpfInfoList: # DNN information list for this S-NSSAI + - dnn: internet + pools: + - cidr: 10.1.128.0/17 + staticPools: + - cidr: 10.1.192.0/24 + interfaces: # Interface list for this UPF + - interfaceType: N3 # the type of the interface (N3 or N9) + endpoints: # the IP address of this N3/N9 interface on this UPF + - 10.100.50.233 + networkInstances: + - internet # Data Network Name (DNN) + links: # the topology graph of userplane, A and B represent the two nodes of each link + - A: gNB1 + B: UPF +locality: area1 # Name of the location where a set of AMF, SMF and UPFs are located + +t3591: + enable: true # true or false + expireTime: 16s # default is 6 seconds + maxRetryTimes: 3 # the max number of retransmission +# retransmission timer for pdu session release command +t3592: + enable: true # true or false + expireTime: 16s # default is 6 seconds + maxRetryTimes: 3 # the max number of retransmission diff --git a/charts/free5gc/charts/free5gc-smf/templates/smf-configmap.yaml b/charts/free5gc/charts/free5gc-smf/templates/smf-configmap.yaml index e8183e7b..81dd11af 100644 --- a/charts/free5gc/charts/free5gc-smf/templates/smf-configmap.yaml +++ b/charts/free5gc/charts/free5gc-smf/templates/smf-configmap.yaml @@ -43,8 +43,7 @@ data: listenAddr: {{ $.Values.global.smf.n4if.ipAddress }} externalAddr: {{ $.Values.global.smf.n4if.ipAddress }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-smf/values.yaml b/charts/free5gc/charts/free5gc-smf/values.yaml index cf2676ef..01138b70 100644 --- a/charts/free5gc/charts/free5gc-smf/values.yaml +++ b/charts/free5gc/charts/free5gc-smf/values.yaml @@ -110,84 +110,6 @@ smf: - nsmf-pdusession - nsmf-event-exposure - nsmf-oam - configuration: |- - smfName: SMF - snssaiInfos: - - sNssai: - sst: 1 - sd: 010203 - dnnInfos: # DNN information list - - dnn: internet # Data Network Name - dns: # the IP address of DNS - ipv4: 8.8.8.8 - ipv6: 2001:4860:4860::8888 - - sNssai: - sst: 1 - sd: 112233 - dnnInfos: # DNN information list - - dnn: internet # Data Network Name - dns: # the IP address of DNS - ipv4: 8.8.8.8 - ipv6: 2001:4860:4860::8888 - - sNssai: - sst: 2 - sd: 112234 - dnnInfos: - - dnn: internet - dns: - ipv4: 8.8.8.8 - ipv6: 2001:4860:4860::8888 - plmnList: # the list of PLMN IDs that this SMF belongs to (optional, remove this key when unnecessary) - - mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9) - mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9) - userplaneInformation: # list of userplane information - upNodes: # information of userplane node (AN or UPF) - gNB1: # the name of the node - type: AN # the type of the node (AN or UPF) - UPF: # the name of the node - type: UPF # the type of the node (AN or UPF) - nodeID: 10.100.50.241 # the IP/FQDN of N4 interface on this UPF (PFCP) - addr: 10.100.50.241 # the IP/FQDN of N4 interface on this UPF (PFCP) - sNssaiUpfInfos: # S-NSSAI information list for this UPF - - sNssai: # S-NSSAI (Single Network Slice Selection Assistance Information) - sst: 1 # Slice/Service Type (uinteger, range: 0~255) - sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF) - dnnUpfInfoList: # DNN information list for this S-NSSAI - - dnn: internet - pools: - - cidr: 10.1.0.0/17 - staticPools: - - cidr: 10.1.64.0/24 - - sNssai: # S-NSSAI (Single Network Slice Selection Assistance Information) - sst: 1 # Slice/Service Type (uinteger, range: 0~255) - sd: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF) - dnnUpfInfoList: # DNN information list for this S-NSSAI - - dnn: internet - pools: - - cidr: 10.1.128.0/17 - staticPools: - - cidr: 10.1.192.0/24 - interfaces: # Interface list for this UPF - - interfaceType: N3 # the type of the interface (N3 or N9) - endpoints: # the IP address of this N3/N9 interface on this UPF - - 10.100.50.233 - networkInstances: - - internet # Data Network Name (DNN) - links: # the topology graph of userplane, A and B represent the two nodes of each link - - A: gNB1 - B: UPF - locality: area1 # Name of the location where a set of AMF, SMF and UPFs are located - - t3591: - enable: true # true or false - expireTime: 16s # default is 6 seconds - maxRetryTimes: 3 # the max number of retransmission - # retransmission timer for pdu session release command - t3592: - enable: true # true or false - expireTime: 16s # default is 6 seconds - maxRetryTimes: 3 # the max number of retransmission - ueRoutingInfo: |- UE1: # Group Name members: diff --git a/charts/free5gc/charts/free5gc-udm/config.yaml b/charts/free5gc/charts/free5gc-udm/config.yaml new file mode 100644 index 00000000..25134227 --- /dev/null +++ b/charts/free5gc/charts/free5gc-udm/config.yaml @@ -0,0 +1,9 @@ +# test data set from TS33501-f60 Annex C.4 +SuciProfile: + - ProtectionScheme: 1 # Protect Scheme: Profile A + PrivateKey: c53c22208b61860b06c62e5406a7b330c2b577aa5558981510d128247d38bd1d + PublicKey: 5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650 + - ProtectionScheme: 2 # Protect Scheme: Profile B + PrivateKey: F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA + PublicKey: 0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4 + diff --git a/charts/free5gc/charts/free5gc-udm/templates/udm-configmap.yaml b/charts/free5gc/charts/free5gc-udm/templates/udm-configmap.yaml index ea99402e..17133d2d 100644 --- a/charts/free5gc/charts/free5gc-udm/templates/udm-configmap.yaml +++ b/charts/free5gc/charts/free5gc-udm/templates/udm-configmap.yaml @@ -38,8 +38,7 @@ data: nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }} - {{- .configuration.configuration | nindent 6 }} - + {{- $.Files.Get "config.yaml" | nindent 6 }} logger: {{- toYaml .configuration.logger | nindent 6 }} diff --git a/charts/free5gc/charts/free5gc-udm/values.yaml b/charts/free5gc/charts/free5gc-udm/values.yaml index 3297b981..2f4ae9a8 100644 --- a/charts/free5gc/charts/free5gc-udm/values.yaml +++ b/charts/free5gc/charts/free5gc-udm/values.yaml @@ -97,16 +97,6 @@ udm: - nudm-ueau - nudm-ee - nudm-pp - configuration: |- - # test data set from TS33501-f60 Annex C.4 - SuciProfile: - - ProtectionScheme: 1 # Protect Scheme: Profile A - PrivateKey: c53c22208b61860b06c62e5406a7b330c2b577aa5558981510d128247d38bd1d - PublicKey: 5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650 - - ProtectionScheme: 2 # Protect Scheme: Profile B - PrivateKey: F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA - PublicKey: 0472DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD15A7DED52FCBB097A4ED250E036C7B9C8C7004C4EEDC4F068CD7BF8D3F900E3B4 - logger: # log output setting enable: true # true or false level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic