update

charts/oai-5g-core/oai-5g-advance/config.yaml

@@ -14,10 +14,11 @@ http_version: 2
 ## Defines YAML anchors, which are reused in the config file
 snssais:
   - &embb_slice1
-    sst: 1
+    sst: @SLICE1_SST@ #1
+    sd: @SLICE1_SD@ # no value before
   - &embb_slice2
-    sst: 1
-    sd: FFFFFF # in hex
+    sst: @SLICE2_SST@ #1
+    sd: @SLICE2_SD@ #FFFFFF # in hex
 
 ############## SBI Interfaces
 ### Each NF takes its local SBI interfaces and remote interfaces from here, unless it gets them using NRF discovery mechanisms
@@ -29,7 +30,7 @@ nfs:
       api_version: v1
       interface_name: eth0
     n2:
-      interface_name: "@IF_N2@"
+      interface_name: @IF_N2@
       port: 38412
   smf:
     host: oai-smf
@@ -38,22 +39,22 @@ nfs:
       api_version: v1
       interface_name: eth0
     n4:
-      interface_name: "@IF_N4@"
+      interface_name: @IF_N4@
       port: 8805
   upf:
     host: oai-upf
     sbi:
       port: 80
       api_version: v1
-      interface_name: eth0
+      interface_name: @IF_SBI@ #eth0
     n3:
-      interface_name: "@IF_N3@"
+      interface_name: @IF_N3@
       port: 2152
     n4:
-      interface_name: "@IF_N4@"
+      interface_name: @IF_N4@
       port: 8805
     n6:
-      interface_name: "@IF_N6@"
+      interface_name: @IF_N6@
     n9:
       interface_name: eth0
       port: 2152
@@ -76,7 +77,7 @@ nfs:
       api_version: v1
       interface_name: eth0
   nrf:
-    host: oai-nrf
+    host: @NFS_NRF_HOST@ #oai-nrf
     sbi:
       port: 80
       api_version: v1
@@ -87,6 +88,7 @@ nfs:
       port: 80
       api_version: v1
       interface_name: eth0
+
 #### Common for UDR and AMF
 database:
   host: mysql
@@ -158,26 +160,26 @@ smf:
           - dnn: "@DNN0@"
       - sNssai: *embb_slice2
         dnnSmfInfoList:
-          - dnn: "ims"
+          - dnn: "@DNN1@"
   local_subscription_infos:
     - single_nssai: *embb_slice1
       dnn: "@DNN0@"
       qos_profile:
-        5qi: 5
-        session_ambr_ul: "200Mbps"
-        session_ambr_dl: "400Mbps"
+        5qi: @SLICE1_5QI@ #5
+        session_ambr_ul: "@SLICE1_UPLINK@" # "200Mbps"
+        session_ambr_dl: "@SLICE1_DOWNLINK@" # "400Mbps"
     - single_nssai: *embb_slice2
-      dnn: "ims"
+      dnn: "@DNN1@"
       qos_profile:
-        5qi: 2
-        session_ambr_ul: "100Mbps"
-        session_ambr_dl: "200Mbps"
+        5qi: @SLICE2_5QI@ #2
+        session_ambr_ul: "@SLICE2_UPLINK@" # "100Mbps"
+        session_ambr_dl: "@SLICE2_DOWNLINK@" # "200Mbps"
 
 upf:
   support_features:
     enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
-    enable_snat: yes           # If "on": Source natting is done for UE, DEFAULT= off
-  remote_n6_gw: localhost      # Dummy host since simple-switch does not use N6 GW
+    enable_snat: @ENABLE_SNAT@ # If "on": Source natting is done for UE, DEFAULT= off
+  remote_n6_gw: 127.0.0.1      # Dummy host since simple-switch does not use N6 GW
   upf_info:
     sNssaiUpfInfoList:
     - sNssai: *embb_slice1
@@ -185,13 +187,13 @@ upf:
         - dnn: @DNN0@
     - sNssai: *embb_slice2
       dnnUpfInfoList:
-        - dnn: ims
+        - dnn: @DNN1@
 
 ## DNN configuration
 dnns:
   - dnn: "@DNN0@"
     pdu_session_type: "IPV4"
     ipv4_subnet: "12.1.1.0/24"
-  - dnn: "ims"
+  - dnn: "@DNN1@"
     pdu_session_type: "IPV4V6"
     ipv4_subnet: "14.1.1.0/24"

charts/oai-5g-core/oai-5g-advance/values.yaml

 global:
   nfConfigurationConfigMap: oai-5g-advance
   clusterIpServiceIpAllocation: true #this will allocate ip-address to cluster Ip service
+  IP_NRF: @IP_NRF@
   waitForNRF: true
   http2Param: "--http2-prior-knowledge"  # if waitForNRF is true and http2 is used for all NF then this param is needed
   timeout: 1
 mysql:
-  enabled: true
+  enabled: @ENABLED_MYSQL@ #true
   imagePullPolicy: IfNotPresent
   oai5gdatabase: basic
   imagePullSecrets:
@@ -13,7 +14,7 @@ mysql:
   persistence:
     enabled: false
 oai-nrf:
-  enabled: true
+  enabled: @ENABLED_NRF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-nrf          ## The image will be pulled from dockerhub
@@ -27,7 +28,7 @@ oai-nrf:
     logLevel: "debug"   #allowed info/error/debug
   nodeSelector: {}
 oai-nssf:
-  enabled: true
+  enabled: @ENABLED_NSSF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-nssf          ## The image will be pulled from dockerhub
@@ -41,7 +42,7 @@ oai-nssf:
     logLevel: "debug"   #allowed info/error/debug
   nodeSelector: {}
 oai-udr:
-  enabled: true
+  enabled: @ENABLED_UDR@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-udr           ## The image will be pulled from dockerhub
@@ -55,7 +56,7 @@ oai-udr:
     logLevel: "debug"   #allowed info/error/debug
   nodeSelector: {}
 oai-udm:
-  enabled: true
+  enabled: @ENABLED_UDM@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-udm           ## The image will be pulled from dockerhub
@@ -69,14 +70,13 @@ oai-udm:
     logLevel: "debug"   #allowed info/error/debug
   nodeSelector: {}
 oai-ausf:
-  enabled: true
+  enabled: @ENABLED_AUSF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-ausf           ## The image will be pulled from dockerhub
     version: v2.0.1                                    ## The branch to be used to pull from dockerhub
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: IfNotPresent
-  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
@@ -90,7 +90,7 @@ oai-ausf:
     logLevel: "debug"   #allowed info/error/debug
   nodeSelector: {}
 oai-amf:
-  enabled: true
+  enabled: @ENABLED_AMF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-amf           ## The image will be pulled from dockerhub
@@ -120,12 +120,12 @@ oai-amf:
       ## If you do not have a gateway leave the field empty
       Gateway: "@GW_AMF_N2@"
       ## If you do not want to add any routes in your pod then leave this field empty
-      routes: "@ROUTES_AMF_N2@"
+      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
+  enabled: @ENABLED_UPF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-upf    ## The image will be pulled from dockerhub
@@ -138,7 +138,7 @@ oai-upf:
   imagePullSecrets:
     - name: "regcred"
   securityContext:
-    privileged: @PRIVILEGED@
+    privileged: true # @PRIVILEGED@ # upf fails without privilege mode on rocky
   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
@@ -158,7 +158,7 @@ oai-upf:
       ## If you do not have a gateway leave the field empty
       Gateway: "@GW_UPF_N3@"
       ## If you don't want to add a default route in your pod then replace this field with ""
-      routes: "@ROUTES_UPF_N3@"
+      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:
@@ -172,7 +172,7 @@ oai-upf:
       ## If you do not have a gateway leave the field empty
       Gateway: "@GW_UPF_N4@"
       ## If you do not want to add any routes in your pod then leave this field empty
-      routes: "@ROUTES_UPF_N4@"
+      routes: @ROUTES_UPF_N4@
       hostInterface: "@IF_NAME_UPF_N4@"
     n6Interface:
       create: @MULTUS_UPF_N6@
@@ -185,7 +185,7 @@ oai-upf:
       ## If you do not have a gateway leave the field empty
       Gateway: "@GW_UPF_N6@"
       ## If you do not want to add any routes in your pod then leave this field empty
-      routes: "@ROUTES_UPF_N6@"
+      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: {}
@@ -211,7 +211,7 @@ oai-upf:
 #    upfIpadd: 172.21.6.95
 #    noOfIperf3Server: 10
 oai-smf:
-  enabled: true
+  enabled: @ENABLED_SMF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-smf           ## The image will be pulled from dockerhub
@@ -233,7 +233,7 @@ oai-smf:
       ## If you do not have a gateway leave the field empty
       Gateway: "@GW_SMF_N4@"
       ## If you do not want to add any routes in your pod then leave this field empty
-      routes: "@ROUTES_SMF_N4@"
+      routes: @ROUTES_SMF_N4@
       hostInterface: "@IF_NAME_SMF_N4@"
   nodeSelector: {}
   imagePullSecrets:

charts/oai-5g-core/oai-5g-basic/config.yaml

@@ -15,7 +15,7 @@ http_version: 2
 snssais:
   - &embb_slice1
     sst: @SLICE1_SST@ #1
-    sd: @SLICE1_SD@ # no line before
+    sd: @SLICE1_SD@ # no value before
   - &embb_slice2
     sst: @SLICE2_SST@ #1
     sd: @SLICE2_SD@ #FFFFFF # in hex
@@ -51,7 +51,7 @@ nfs:
       interface_name: @IF_N3@
       port: 2152
     n4:
-      interface_name: @IF_N4@ 
+      interface_name: @IF_N4@
       port: 8805
     n6:
       interface_name: @IF_N6@
@@ -115,7 +115,7 @@ amf:
   plmn_support_list:
     - mcc: @MCC@
       mnc: @MNC@
-      tac: @TAC@ 
+      tac: @TAC@
       nssai:
         - *embb_slice1
         - *embb_slice2
@@ -172,7 +172,7 @@ smf:
 upf:
   support_features:
     enable_bpf_datapath: no    # If "on": BPF is used as datapath else simpleswitch is used, DEFAULT= off
-    enable_snat: @ENABLE_SNAT@           # If "on": Source natting is done for UE, DEFAULT= off
+    enable_snat: @ENABLE_SNAT@ # If "on": Source natting is done for UE, DEFAULT= off
   remote_n6_gw: 127.0.0.1      # Dummy host since simple-switch does not use N6 GW
   upf_info:
     sNssaiUpfInfoList:

charts/oai-5g-core/oai-5g-basic/values.yaml

@@ -114,8 +114,6 @@ oai-upf:
   enabled: @ENABLED_UPF@ #true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
-    #repository: docker.io/r2labuser/oai-upf    ## The image will be pulled from dockerhub
-    #version: v2.0.0                                    ## The branch to be used to pull from dockerhub
     repository: docker.io/oaisoftwarealliance/oai-upf    ## The image will be pulled from dockerhub
     version: v2.0.1                                    ## The branch to be used to pull from dockerhub
     # pullPolicy: IfNotPresent or Never or Always
@@ -177,7 +175,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@ 
+  nodeName: @NODE_UPF@
 # oai-traffic-server:
 #  enabled: false
 #  weight: 6