Skip to content
Snippets Groups Projects
Commit 32f87bfd authored by turletti's avatar turletti
Browse files

smf fix plus oai-5g-advance changes for r2lab deployment

parent 97961e57
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
charts/oai-5g-core/oai-5g-advance/config.yaml
+ 17
− 17
View file @ 32f87bfd
......@@ -29,7 +29,7 @@ nfs:
api_version: v1
interface_name: eth0
n2:
interface_name: eth0
interface_name: "@IF_N2@"
port: 38412
smf:
host: oai-smf
......@@ -38,7 +38,7 @@ nfs:
api_version: v1
interface_name: eth0
n4:
interface_name: eth0
interface_name: "@IF_N4@"
port: 8805
upf:
host: oai-upf
......@@ -47,13 +47,13 @@ nfs:
api_version: v1
interface_name: eth0
n3:
interface_name: eth0
interface_name: "@IF_N3@"
port: 2152
n4:
interface_name: eth0
interface_name: "@IF_N4@"
port: 8805
n6:
interface_name: eth0
interface_name: "@IF_N6@"
n9:
interface_name: eth0
port: 2152
......@@ -111,15 +111,15 @@ amf:
statistics_timer_interval: 20 # in seconds
emergency_support: false
served_guami_list:
- mcc: 001
mnc: 01
- mcc: @MCC@
mnc: @MNC@
amf_region_id: 01
amf_set_id: 001
amf_pointer: 01
plmn_support_list:
- mcc: 001
mnc: 01
tac: 0x0001
- mcc: @MCC@
mnc: @MNC@
tac: @TAC@
nssai:
- *embb_slice1
- *embb_slice2
......@@ -142,9 +142,9 @@ smf:
config:
enable_usage_reporting: no
ue_dns:
primary_ipv4: "10.3.2.200"
primary_ipv4: "@IP_DNS1@"
primary_ipv6: "2001:4860:4860::8888"
secondary_ipv4: "8.8.8.8"
secondary_ipv4: "@IP_DNS2@"
secondary_ipv6: "2001:4860:4860::8888"
ims:
pcscf_ipv4: "192.168.70.139"
......@@ -155,13 +155,13 @@ smf:
sNssaiSmfInfoList:
- sNssai: *embb_slice1
dnnSmfInfoList:
- dnn: "oai"
- dnn: "@DNN0@"
- sNssai: *embb_slice2
dnnSmfInfoList:
- dnn: "ims"
local_subscription_infos:
- single_nssai: *embb_slice1
dnn: "oai"
dnn: "@DNN0@"
qos_profile:
5qi: 5
session_ambr_ul: "200Mbps"
......@@ -182,16 +182,16 @@ upf:
sNssaiUpfInfoList:
- sNssai: *embb_slice1
dnnUpfInfoList:
- dnn: oai
- dnn: @DNN0@
- sNssai: *embb_slice2
dnnUpfInfoList:
- dnn: ims
## DNN configuration
dnns:
- dnn: "oai"
- dnn: "@DNN0@"
pdu_session_type: "IPV4"
ipv4_subnet: "12.1.1.0/24"
- dnn: "ims"
pdu_session_type: "IPV4V6"
ipv4_subnet: "14.1.1.0/24"
\ No newline at end of file
ipv4_subnet: "14.1.1.0/24"
charts/oai-5g-core/oai-5g-advance/values.yaml
+ 80
− 42
View file @ 32f87bfd
......@@ -20,7 +20,7 @@ oai-nrf:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
config:
......@@ -36,7 +36,7 @@ oai-nssf:
pullPolicy: IfNotPresent
imagePullSecrets:
- name: "regcred"
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
config:
logLevel: "debug" #allowed info/error/debug
nodeSelector: {}
......@@ -48,7 +48,7 @@ oai-udr:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
config:
......@@ -62,7 +62,7 @@ oai-udm:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
config:
......@@ -76,9 +76,16 @@ oai-ausf:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
start:
tcpdump: @START_TCPDUMP@
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
securityContext:
privileged: @PRIVILEGED@
persistent:
sharedvolume: @SHAREDVOLUME@
config:
logLevel: "debug" #allowed info/error/debug
nodeSelector: {}
......@@ -90,24 +97,33 @@ oai-amf:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
start:
tcpdump: @START_TCPDUMP@
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
securityContext:
privileged: @PRIVILEGED@
persistent:
sharedvolume: @SHAREDVOLUME@
multus:
## If you don't want to add a default route in your pod then replace this field with ""
defaultGateway: ""
defaultGateway: "@CN_DEFAULT_GW@"
n2Interface:
create: false
Ipadd: "172.21.6.94"
Netmask: "22"
create: @MULTUS_AMF_N2@
Ipadd: "@IP_AMF_N2@"
Netmask: "@NETMASK_AMF_N2@"
## If you do not need a specific mac address leave the field empty
Mac: "@MAC_AMF_N2@"
# #name inside the pod is hardcoded right now
# name: "n2"
## If you do not have a gateway leave the field empty
Gateway:
Gateway: "@GW_AMF_N2@"
## If you do not want to add any routes in your pod then leave this field empty
routes: [{'dst': '10.8.0.0/24','gw': '172.21.7.254'}]
hostInterface: "bond0" # Interface of the host machine on which this pod will be scheduled
routes: "@ROUTES_AMF_N2@"
hostInterface: "@IF_NAME_AMF_N2@" # Interface of the host machine on which this pod will be scheduled
nodeSelector: {}
nodeName: @NODE_AMF@
oai-upf:
enabled: true
kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
......@@ -116,51 +132,64 @@ oai-upf:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
start:
tcpdump: @START_TCPDUMP@
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
imagePullSecrets:
- name: "regcred"
securityContext:
privileged: @PRIVILEGED@
persistent:
sharedvolume: @SHAREDVOLUME@
# create an extra interface for N3 incase the gNB is outside the cluster network or there is a need to have dedicated interface for N3
## Change these ip-addresses according to your environment
## N4, N6 are optional only if you want that UPF uses different subnets for different 3gpp interfaces.
multus:
## If you don't want to add a default route in your pod then replace this field with ""
defaultGateway: ""
defaultGateway: "@CN_DEFAULT_GW@"
n3Interface:
create: false
Ipadd: "172.21.8.95"
Netmask: "22"
create: @MULTUS_UPF_N3@
Ipadd: "@IP_UPF_N3@"
Netmask: "@NETMASK_UPF_N3@"
## If you do not need a specific mac address leave the field empty
Mac: "@MAC_UPF_N3@"
# #name inside the pod is hardcoded right now
# name: "n3"
## If you do not have a gateway leave the field empty
Gateway: ""
Gateway: "@GW_UPF_N3@"
## If you don't want to add a default route in your pod then replace this field with ""
routes: [{'dst': '10.8.0.0/24','gw': '172.21.11.254'}, {'dst': '10.9.0.0/24','gw': '172.21.11.254'}]
hostInterface: "bond0"
routes: "@ROUTES_UPF_N3@"
hostInterface: "@IF_NAME_UPF_N3@"
## For n4 it is better to re-use eth0 interface inside the pod (primary CNI of Kubernetes)
n4Interface:
create: false
Ipadd: "192.168.24.2"
Netmask: "24"
create: @MULTUS_UPF_N4@
Ipadd: "@IP_UPF_N4@"
Netmask: "@NETMASK_UPF_N4@"
## If you do not need a specific mac address leave the field empty
Mac: "@MAC_UPF_N4@"
# #name inside the pod is hardcoded right now
# name: "n4"
## If you do not have a gateway leave the field empty
Gateway: ""
Gateway: "@GW_UPF_N4@"
## If you do not want to add any routes in your pod then leave this field empty
routes: ""
hostInterface: "bond0"
routes: "@ROUTES_UPF_N4@"
hostInterface: "@IF_NAME_UPF_N4@"
n6Interface:
create: false
Ipadd: "192.168.22.2"
create: @MULTUS_UPF_N6@
Ipadd: "@IP_UPF_N6@"
# #name inside the pod is hardcoded right now
# name: "n6"
Netmask: "24"
Netmask: "@NETMASK_UPF_N6@"
## If you do not need a specific mac address leave the field empty
Mac: "@MAC_UPF_N6@"
## If you do not have a gateway leave the field empty
Gateway: ""
Gateway: "@GW_UPF_N6@"
## If you do not want to add any routes in your pod then leave this field empty
routes: ""
hostInterface: "bond0"
routes: "@ROUTES_UPF_N6@"
hostInterface: "@IF_NAME_UPF_N6@"
#NOTE: If the interface you selected for n6If is wrong then traffic will not be routed towards internet
nodeSelector: {}
nodeName: @NODE_UPF@
# oai-traffic-server:
# enabled: false
# weight: 6
......@@ -170,7 +199,7 @@ oai-upf:
# version: latest
# #pullPolicy: IfNotPresent or Never or Always
# pullPolicy: IfNotPresent
# #Without multus traffic server won't be able to forward packets to spgwu if can't use server then add an extra container in spgwu with iperf3 or install iperf3 package in tcpdump container
# #Without multus traffic server won't be able to forward packets to upf if can't use server then add an extra container in upf with iperf3 or install iperf3 package in tcpdump container
# multus:
# create: true
# IPadd: "172.21.6.99"
......@@ -189,20 +218,29 @@ oai-smf:
version: v2.0.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
includeTcpDumpContainer: false #only for taking pcaps inside network function pod
start:
tcpdump: @START_TCPDUMP@
includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod
multus:
## If you don't want to add a default route in your pod then replace this field with ""
defaultGateway: ""
defaultGateway: "@CN_DEFAULT_GW@"
n4Interface:
create: false
Ipadd: "192.168.24.3"
Netmask: "24"
create: @MULTUS_SMF_N4@
Ipadd: "@IP_SMF_N4@"
Netmask: "@NETMASK_SMF_N4@"
## If you do not need a specific mac address leave the field empty
Mac: "@MAC_SMF_N4@"
## If you do not have a gateway leave the field empty
Gateway: ""
Gateway: "@GW_SMF_N4@"
## If you do not want to add any routes in your pod then leave this field empty
#routes: [{'dst': '10.8.0.0/24','gw': '172.21.7.254'}, {'dst': '10.9.0.0/24','gw': '172.21.7.254'}]
hostInterface: "bond0"
routes: "@ROUTES_SMF_N4@"
hostInterface: "@IF_NAME_SMF_N4@"
nodeSelector: {}
imagePullSecrets:
- name: "regcred"
securityContext:
privileged: @PRIVILEGED@
persistent:
sharedvolume: @SHAREDVOLUME@
nodeSelector: {}
nodeName: @NODE_SMF@
charts/oai-5g-core/oai-5g-basic/config.yaml
+ 3
− 4
View file @ 32f87bfd
......@@ -38,7 +38,7 @@ nfs:
api_version: v1
interface_name: eth0
n4:
interface_name: eth0
interface_name: "@IF_N4@"
port: 8805
upf:
host: oai-upf
......@@ -47,7 +47,7 @@ nfs:
api_version: v1
interface_name: eth0
n3:
interface_name: "@IF_N3@"
interface_name: "@IF_N3@"
port: 2152
n4:
interface_name: "@IF_N4@"
......@@ -114,7 +114,7 @@ amf:
plmn_support_list:
- mcc: @MCC@
mnc: @MNC@
tac: @TAC@ ##TAC was 0x0001##
tac: @TAC@
nssai:
- *embb_slice1
- *embb_slice2
......@@ -190,4 +190,3 @@ dnns:
- dnn: "ims"
pdu_session_type: "IPV4V6"
ipv4_subnet: "14.1.1.0/24"
charts/oai-5g-core/oai-5g-basic/values.yaml
+ 1
− 1
View file @ 32f87bfd
......@@ -174,7 +174,7 @@ oai-upf:
hostInterface: "@IF_NAME_UPF_N6@"
#NOTE: If the interface you selected for n6If is wrong then traffic will not be routed towards internet
nodeSelector: {}
nodeName: @NODE_UPF@ ###TO CHANGE IN OAI5G_RRU : SPGWU -> UPF###
nodeName: @NODE_UPF@
# oai-traffic-server:
# enabled: false
# weight: 6
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment