Enable closed-loop capability (optional feature)

5g-control-plane/Chart.yaml

@@ -10,7 +10,7 @@ description: SD-Core 5G control plane services
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.2.4
+version: 2.2.5
 
 dependencies:
   - name: mongodb

5g-control-plane/values.yaml

@@ -741,8 +741,8 @@ config:
           debugProfileServer:
             addr: POD_IP
             port: 5001
-          onosApiServer:
-            addr: "onosapp"
+          userAppApiServer:
+            addr: "userAppapp"
             port: 9301
           rocEndPoint:
             addr: "aether-roc-umbrella-aether-roc-gui-v2-1-external.aether-roc.svc"

README.md

@@ -14,23 +14,6 @@ file from [Aether-Onramp](https://docs.aetherproject.org/master/onramp/overview.
 Morever, some values need to be accordingly updated depending on the specific
 deployment/setup as shown below.
 
-## Pre-requisites (If NOT using Aehter OnRamp)
-
-The only pre-requisite to use the Helm Charts by themselves is the creation of
-the namespace for `cert-manager` in Kubernetes. That is, by default, the Helm
-Charts will try to deploy `cert-manager` in the namespace called `cert-manager`,
-as shown below. Therefore, the user needs to create this namespace before
-installing the Helm Charts.
-
-```yaml
-certmanager:
-  enabled: true
-  fullnameOverride: certmanager
-  namespace: cert-manager
-  crds:
-    enabled: true
-```
-
 ## Example of usage with Aether OnRamp
 
 It is strongly recommended to use [Aether-Onramp](https://docs.aetherproject.org/master/onramp/overview.html)

bess-upf/Chart.yaml

@@ -7,4 +7,4 @@ description: OMEC user plane based on BESS
 name: bess-upf
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.2.2
+version: 1.3.0

bess-upf/templates/bin/_bessd-poststart.sh.tpl

@@ -4,8 +4,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+{{- $config := "up4" -}}
+{{- if .Values.config.upf.closedLoop -}}
+{{- $config = "closed_loop" -}}
+{{- end -}}
+
 set -ex
 
-until bessctl run /opt/bess/bessctl/conf/up4; do
+until bessctl run /opt/bess/bessctl/conf/{{ $config }}; do
     sleep 2;
 done;

bess-upf/templates/service-upf.yaml

@@ -32,6 +32,11 @@ spec:
     nodePort: {{ .Values.service.nodePort }}
 {{- end }}
 {{- end }}
+{{- if .Values.config.upf.closedLoop }}
+  - name: closed-loop
+    protocol: TCP
+    port: {{ .Values.config.upf.closedLoopPort }}
+{{- end }}
 ---
 apiVersion: v1
 kind: Service

bess-upf/templates/statefulset-upf.yaml

@@ -143,6 +143,10 @@ spec:
         env:
           - name: CONF_FILE
             value: /etc/bess/conf/upf.jsonc
+        {{- if .Values.config.upf.closedLoop }}
+          - name: CLOSED_LOOP_SOCKET_PATH
+            value: /pod-share/closedloop
+        {{- end }}
         volumeMounts:
           - name: shared-app
             mountPath: /pod-share
@@ -217,6 +221,27 @@ spec:
           requests:
             cpu: 128m
             memory: 64Mi
+    {{- end }}
+    {{- if .Values.config.upf.closedLoop }}
+      - name: closed-loop
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.bess }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+        env:
+          - name: CLOSED_LOOP_PORT
+            value: {{ .Values.config.upf.closedLoopPort | quote }}
+          - name: CLOSED_LOOP_SOCKET_PATH
+            value: /pod-share/closedloop
+        command: ["/opt/bess/bessctl/conf/closed_loop_svr.py"]
+        resources:
+          limits:
+            cpu: 128m
+            memory: 256Mi
+          requests:
+            cpu: 128m
+            memory: 256Mi
+        volumeMounts:
+          - name: shared-app
+            mountPath: /pod-share
     {{- end }}
       volumes:
       - name: configs

bess-upf/values.yaml

@@ -5,8 +5,8 @@
 images:
   repository: "" #default docker hub
   tags:
-    bess: omecproject/upf-epc-bess:rel-2.0.2
-    pfcpiface: omecproject/upf-epc-pfcpiface:rel-2.0.2
+    bess: omecproject/upf-epc-bess:rel-2.1.0
+    pfcpiface: omecproject/upf-epc-pfcpiface:rel-2.1.0
     tools: omecproject/pod-init:rel-1.1.2
   pullPolicy: IfNotPresent
   # Secrets must be manually created in the namespace.
@@ -95,6 +95,8 @@ config:
       #mac:
       #vlan:
       #iface:
+    closedLoop: false
+    closedLoopPort: 9301
     cfgFiles:
       upf.jsonc:
         mode: dpdk

sdcore-helm-charts/Chart.yaml

@@ -10,7 +10,7 @@ name: sd-core
 description: SD-Core control plane services
 icon: https://guide.opencord.org/logos/cord.svg
 type: application
-version: 2.2.4
+version: 2.2.5
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
@@ -28,12 +28,12 @@ dependencies:
     condition: omec-sub-provision.enable
 
   - name: 5g-control-plane
-    version: 2.2.4
+    version: 2.2.5
     repository: "file://../5g-control-plane"
     condition: 5g-control-plane.enable5G
 
   - name: bess-upf
-    version: 1.2.2
+    version: 1.3.0
     repository: "file://../bess-upf"
     alias: omec-user-plane
     condition: omec-user-plane.enable