Skip to content
Snippets Groups Projects
Commit 869f9b85 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

test(cluster): missing log level field in generated conf files

parent e1ebc3da
No related branches found
No related tags found
1 merge request!107test(cluster): missing log level field in generated conf files
Showing
with 148 additions and 46 deletions
......@@ -10,6 +10,7 @@ data:
PID_DIRECTORY = "/var/run"; # /var/run is the default
AMF_NAME = "OAI-AMF";
LOG_LEVEL = "{{ .Values.config.logLevel }}";
RELATIVE_CAPACITY = 30;
# Display statistics about whole system (in seconds)
......@@ -137,4 +138,4 @@ data:
NGAP_MESSAGE = (
{MSG_NAME = "NGSetupRequest"; ProcedureCode = 21; TypeOfMessage = "initialMessage"}
);
};
\ No newline at end of file
};
......@@ -91,7 +91,7 @@ config:
mySqlUser: "root" # OPTIONAL: used only if not using AUSF
mySqlPass: "linux" # OPTIONAL: used only if not using AUSF
mySqlDb: "oai_db" # OPTIONAL: used only if not using AUSF
logLevel: "info"
persistent:
sharedvolume: true
......
......@@ -116,6 +116,11 @@ spec:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: ausfName
- name: LOG_LEVEL
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: logLevel
- name: SBI_IF_NAME
valueFrom:
configMapKeyRef:
......
......@@ -48,6 +48,7 @@ config:
tz: "Europe/Paris"
instanceId: "0"
pidDirectory: "/var/run"
logLevel: "info"
ausfName: "OAI_AUSF"
sbiIfName: "eth0"
sbiPortHttp1: "80"
......
......@@ -112,6 +112,11 @@ spec:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nrfApiVersion
- name: LOG_LEVEL
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: logLevel
volumes:
{{- if .Values.persistent.sharedvolume}}
- name: cn5g-pvc
......
......@@ -52,6 +52,7 @@ config:
nrfInterfacePortForSBI: "80"
nrfInterfaceHttp2PortForSBI: "8080"
nrfApiVersion: "v1"
logLevel: "info"
persistent:
sharedvolume: true
......
......@@ -7,26 +7,31 @@ data:
SMF =
{
FQDN = "oai-smf";
INSTANCE = 0; # 0 is the default
PID_DIRECTORY = "/var/run"; # /var/run is the default
INSTANCE = 0;
PID_DIRECTORY = "/var/run";
LOG_LEVEL = "{{ .Values.config.logLevel }}"
INTERFACES :
{
N4 :
{
# SMF binded interface for N4 communication (UPF)
INTERFACE_NAME = "{{ .Values.config.smfInterfaceNameForN4 }}"; # YOUR NETWORK CONFIG HERE
INTERFACE_NAME = "{{ .Values.config.smfInterfaceNameForN4 }}";
IPV4_ADDRESS = "read";
};
SBI :
{
# SMF binded interface for SBI interface (e.g., communication with AMF, UDM)
INTERFACE_NAME = "{{ .Values.config.smfInterfaceNameForSBI }}"; # YOUR NETWORK CONFIG HERE
# YOUR NETWORK CONFIG HERE
INTERFACE_NAME = "{{ .Values.config.smfInterfaceNameForSBI }}";
IPV4_ADDRESS = "read";
PORT = {{ .Values.config.smfInterfacePortForSBI }}; # YOUR NETWORK CONFIG HERE (default: 80)
HTTP2_PORT = {{ .Values.config.smfInterfaceHttp2PortForSBI }}; # YOUR NETWORK CONFIG HERE
API_VERSION = "{{ .Values.config.smfApiVersion }}"; # YOUR SMF API VERSION CONFIG HERE
# YOUR NETWORK CONFIG HERE (default: 80)
PORT = {{ .Values.config.smfInterfacePortForSBI }};
# YOUR NETWORK CONFIG HERE (default: 8080)
HTTP2_PORT = {{ .Values.config.smfInterfaceHttp2PortForSBI }};
# YOUR SMF API VERSION CONFIG HERE (default: v1)
API_VERSION = "{{ .Values.config.smfApiVersion }}";
};
};
......@@ -37,27 +42,48 @@ data:
DNN_LIST = (
# PDU_SESSION_TYPE choice in {IPv4, IPv6, IPv4v6}
# DNN IP ADDRESS RANGE format is for example: "12.2.1.2 - 12.2.1.128"
{DNN_NI = "{{ .Values.config.dnnNi0 }}"; PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype0 }}"; IPV4_RANGE = "{{ .Values.config.ipv4dnnRange0 }}"; IPV6_PREFIX = "2001:1:2::/64"}
{
DNN_NI = "{{ .Values.config.dnnNi0 }}";
PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype0 }}";
IPV4_RANGE = "{{ .Values.config.ipv4dnnRange0 }}";
IPV6_PREFIX = "2001:1:2::/64"
}
{{- if .Values.config.dnnNi1}}
,{DNN_NI = "{{ .Values.config.dnnNi1 }}"; PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype1 }}"; IPV4_RANGE = "{{ .Values.config.ipv4dnnRange1 }}"; IPV6_PREFIX = "3001:1:2::/64"}
,{
DNN_NI = "{{ .Values.config.dnnNi1 }}";
PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype1 }}";
IPV4_RANGE = "{{ .Values.config.ipv4dnnRange1 }}";
IPV6_PREFIX = "3001:1:2::/64"
}
{{- end }}
{{- if .Values.config.dnnNi2}}
,{DNN_NI = "{{ .Values.config.dnnNi2 }}"; PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype2 }}"; IPV4_RANGE = "{{ .Values.config.ipv4dnnRange2 }}"; IPV6_PREFIX = "4001:1:2::/64"}
,{
DNN_NI = "{{ .Values.config.dnnNi2 }}";
PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype2 }}";
IPV4_RANGE = "{{ .Values.config.ipv4dnnRange2 }}";
IPV6_PREFIX = "4001:1:2::/64"
}
{{- end }}
{{- if .Values.config.dnnNi3}}
{DNN_NI = "{{ .Values.config.dnnNi3 }}"; PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype3 }}"; IPV4_RANGE = "{{ .Values.config.ipv4dnnRange3 }}"; IPV6_PREFIX = "5001:1:2::/64"}
{
DNN_NI = "{{ .Values.config.dnnNi3 }}";
PDU_SESSION_TYPE = "{{ .Values.config.pdusessiontype3 }}";
IPV4_RANGE = "{{ .Values.config.ipv4dnnRange3 }}";
IPV6_PREFIX = "5001:1:2::/64"
}
{{- end }}
);
# DNS address communicated to UEs
DEFAULT_DNS_IPV4_ADDRESS = "{{ .Values.config.dnsIpv4Address }}"; # YOUR DNS CONFIG HERE
DEFAULT_DNS_SEC_IPV4_ADDRESS = "{{ .Values.config.dnsSecIpv4Address }}"; # YOUR DNS CONFIG HERE
# YOUR DNS CONFIG HERE
DEFAULT_DNS_IPV4_ADDRESS = "{{ .Values.config.dnsIpv4Address }}";
DEFAULT_DNS_SEC_IPV4_ADDRESS = "{{ .Values.config.dnsSecIpv4Address }}";
# IPV6 tunnels are not supported
DEFAULT_DNS_IPV6_ADDRESS = "2001:4860:4860::8888"; # YOUR DNS CONFIG HERE
DEFAULT_DNS_SEC_IPV6_ADDRESS = "2001:4860:4860::8844"; # YOUR DNS CONFIG HERE
DEFAULT_DNS_IPV6_ADDRESS = "2001:4860:4860::8888";
DEFAULT_DNS_SEC_IPV6_ADDRESS = "2001:4860:4860::8844";
#Default P-CSCF server
DEFAULT_CSCF_IPV4_ADDRESS = "{{ .Values.config.defaultCSCFIpv4Address }}";
DEFAULT_CSCF_IPV4_ADDRESS = "{{ .Values.config.defaultCSCFIpv4Address }}";
DEFAULT_CSCF_IPV6_ADDRESS = "fe80::7915:f408:1787:db8b";
#Default UE MTU
......@@ -67,20 +93,32 @@ data:
SUPPORT_FEATURES:
{
# STRING, {"yes", "no"},
REGISTER_NRF = "{{ .Values.config.registerNrf }}"; # Set to yes if SMF resgisters to an NRF
DISCOVER_UPF = "{{ .Values.config.discoverUpf }}"; # Set to yes to enable UPF discovery and selection
DISCOVER_PCF = "{{ .Values.config.discoverPcf }}"; # Set to yes to enable PCF discovery and selection
FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no"; # Non standard feature, normally should be set to "no",
# but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
USE_LOCAL_SUBSCRIPTION_INFO = "{{ .Values.config.useLocalSubscriptionInfo }}"; # Set to yes if SMF uses local subscription information instead of from an UDM
USE_LOCAL_PCC_RULES = "{{ .Values.config.useLocalPCCRules }}"; # Set to yes if SMF uses local PCC rules instead of from an PCF
USE_FQDN_DNS = "{{ .Values.config.useFqdnDns }}"; # Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
HTTP_VERSION = {{ .Values.config.httpVersion }}; # Default: 1
# Set to yes if SMF resgisters to an NRF
REGISTER_NRF = "{{ .Values.config.registerNrf }}";
# Set to yes to enable UPF discovery and selection
DISCOVER_UPF = "{{ .Values.config.discoverUpf }}";
# Set to yes to enable PCF discovery and selection
DISCOVER_PCF = "{{ .Values.config.discoverPcf }}";
# Non standard feature, normally should be set to "no",
# but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no";
# Set to yes if SMF uses local subscription information instead of from an UDM
USE_LOCAL_SUBSCRIPTION_INFO = "{{ .Values.config.useLocalSubscriptionInfo }}";
# Set to yes if SMF uses local PCC rules instead of from an PCF
USE_LOCAL_PCC_RULES = "{{ .Values.config.useLocalPCCRules }}";
# Set to yes if AMF/UDM/NRF/UPF will relying on a DNS to resolve FQDN
USE_FQDN_DNS = "{{ .Values.config.useFqdnDns }}";
# Default: 1
HTTP_VERSION = {{ .Values.config.httpVersion }};
{{- if .Values.config.upfSpgwu}}
ENABLE_USAGE_REPORTING = "no" # Set yes if UE USAGE REPORTING is to be done at UPF
{{- else }}
ENABLE_USAGE_REPORTING = "yes" # Set yes if UE USAGE REPORTING is to be done at UPF
{{- end }}
# Set yes if Downlink PDR is to be included in PFCP session establishment message
ENABLE_DL_PDR_IN_PFCP_SESS_ESTAB = "{{ .Values.config.useDlPdrInPfcpSessEsta }}";
# Set N3_LOCAL_IPV4_ADDRESS for SD-Fabric UPF
N3_LOCAL_IPV4_ADDRESS = "{{ .Values.config.localN3Ipv4Address }}";
}
AMF :
......@@ -124,41 +162,77 @@ data:
LOCAL_CONFIGURATION :
{
SESSION_MANAGEMENT_SUBSCRIPTION_LIST = (
{ NSSAI_SST = {{ .Values.config.nssaiSst0 }},DNN = "{{ .Values.config.dnnNi0 }}", DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype0 }}", DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi0 }}, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl0 }}", SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl0 }}"
{
NSSAI_SST = {{ .Values.config.nssaiSst0 }},
{{- if .Values.config.nssaiSd0}}
,NSSAI_SD = "{{ .Values.config.nssaiSd0 }}"
NSSAI_SD = "{{ .Values.config.nssaiSd0 }}",
{{- end }}
DNN = "{{ .Values.config.dnnNi0 }}",
DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype0 }}",
DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi0 }},
QOS_PROFILE_PRIORITY_LEVEL = 1,
QOS_PROFILE_ARP_PRIORITY_LEVEL = 15,
QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE",
SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl0 }}",
SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl0 }}"
}
{{- if .Values.config.dnnNi1}}
,{ NSSAI_SST = {{ .Values.config.nssaiSst1 }},DNN = "{{ .Values.config.dnnNi1 }}", DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype1 }}", DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi1 }}, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl1 }}", SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl1 }}"
,{
NSSAI_SST = {{ .Values.config.nssaiSst1 }},
{{- if .Values.config.nssaiSd1}}
,NSSAI_SD = "{{ .Values.config.nssaiSd1 }}"
NSSAI_SD = "{{ .Values.config.nssaiSd1 }}",
{{- end }}
DNN = "{{ .Values.config.dnnNi1 }}",
DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype1 }}",
DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi1 }},
QOS_PROFILE_PRIORITY_LEVEL = 1,
QOS_PROFILE_ARP_PRIORITY_LEVEL = 15,
QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE",
SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl1 }}",
SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl1 }}"
}
{{- end }}
{{- if .Values.config.dnnNi2}}
,{ NSSAI_SST = {{ .Values.config.nssaiSst2 }},DNN = "{{ .Values.config.dnnNi2 }}", DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype2 }}", DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi2 }}, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl2 }}", SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl2 }}"
,{
NSSAI_SST = {{ .Values.config.nssaiSst2 }},
{{- if .Values.config.nssaiSd2}}
,NSSAI_SD = "{{ .Values.config.nssaiSd2 }}"
NSSAI_SD = "{{ .Values.config.nssaiSd2 }}",
{{- end }}
DNN = "{{ .Values.config.dnnNi2 }}",
DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype2 }}",
DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi2 }},
QOS_PROFILE_PRIORITY_LEVEL = 1,
QOS_PROFILE_ARP_PRIORITY_LEVEL = 15,
QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE",
SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl2 }}",
SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl2 }}"
}
{{- end }}
{{- if .Values.config.dnnNi3}}
,{ NSSAI_SST = {{ .Values.config.nssaiSst3 }},DNN = "{{ .Values.config.dnnNi3 }}", DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype3 }}", DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi3 }}, QOS_PROFILE_PRIORITY_LEVEL = 1, QOS_PROFILE_ARP_PRIORITY_LEVEL = 15, QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE", SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl3 }}", SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl3 }}"
,{
NSSAI_SST = {{ .Values.config.nssaiSst3 }},
{{- if .Values.config.nssaiSd3}}
,NSSAI_SD = "{{ .Values.config.nssaiSd3 }}"
NSSAI_SD = "{{ .Values.config.nssaiSd3 }}",
{{- end }}
DNN = "{{ .Values.config.dnnNi3 }}",
DEFAULT_SESSION_TYPE = "{{ .Values.config.pdusessiontype3 }}",
DEFAULT_SSC_MODE = 1,
QOS_PROFILE_5QI = {{ .Values.config.qosProfile5qi3 }},
QOS_PROFILE_PRIORITY_LEVEL = 1,
QOS_PROFILE_ARP_PRIORITY_LEVEL = 15,
QOS_PROFILE_ARP_PREEMPTCAP = "NOT_PREEMPT",
QOS_PROFILE_ARP_PREEMPTVULN = "NOT_PREEMPTABLE",
SESSION_AMBR_UL = "{{ .Values.config.sessionAmbrUl3 }}",
SESSION_AMBR_DL = "{{ .Values.config.sessionAmbrDl3 }}"
}
{{- end }}
);
};
};
\ No newline at end of file
};
......@@ -71,6 +71,8 @@ config:
useLocalSubscriptionInfo: "yes" # If yes ip-allocation will be handled by SMF if no the information will be reterived from UDM
useFqdnDns: "yes" # use only when the DNS can resolve FQDN of other network functions
useLocalPCCRules: "yes" # Set to yes if SMF uses local PCC rules instead of from an PCF
useDlPdrInPfcpSessEsta: "no" # Set to yes if Downlink PDR is to be included in PFCP session establishment message
localN3Ipv4Address: "0.0.0.0" # for SD-Fabric UPF
discoverPcf: "no" # Set to yes if PCF is used and want to be discovered via NRF
ueMtu: 1500
registerNrf: "yes" # if wants to use NRF registry and discovery
......@@ -96,7 +98,7 @@ config:
qosProfile5qi1: 1
sessionAmbrUl1: "1000Mbps"
sessionAmbrDl1: "1000Mbps"
logLevel: "info"
## currently only used by tcpdump container to store the tcpdump, this volume will be shared between all the network functions (If true it should be true for all the NFs specially NRF)
persistent:
......
......@@ -23,6 +23,7 @@ data:
FQDN = "oai-spgwu-tiny-svc"; # only needed for 4g
INSTANCE = 0; # 0 is the default
PID_DIRECTORY = "/var/run"; # /var/run is the default
LOG_LEVEL = "{{ .Values.config.logLevel }}";
INTERFACES :
{
......
......@@ -76,7 +76,7 @@ config:
nssaiSst1: 1 # should match with SMF information (Optional, if removed slice will not be configured)
nssaiSd1: "0xFFFFFF" # should match with SMF information (Optional, if removed sd value will be 0xFFFFFF only if nssaiSst1 is configured)
dnn1: "ims" # should match with SMF information
logLevel: "info"
## currently only used by tcpdump container to store the tcpdump, this volume will be shared between all the network functions
persistent:
......
......@@ -71,6 +71,11 @@ spec:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: pidDirectory
- name: LOG_LEVEL
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: logLevel
- name: UDM_NAME
valueFrom:
configMapKeyRef:
......
......@@ -45,6 +45,7 @@ config:
tz: "Europe/Paris"
instance: 0
pidDirectory: "/var/run"
logLevel: "info"
udmName: "oai-udm"
sbiIfName: "eth0"
sbiPortHttp1: "80"
......
......@@ -114,6 +114,11 @@ spec:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: pidDirectory
- name: LOG_LEVEL
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: logLevel
- name: USE_FQDN_DNS
valueFrom:
configMapKeyRef:
......
......@@ -52,6 +52,7 @@ config:
instance: "0"
udrname: "oai-udr"
pidDirectory: "/var/run"
logLevel: "info"
sbiIfName: "eth0"
sbiPortHttp1: "80"
sbiPortHttp2: "8080"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment