Merge "Add configmap to introduce environment variables for alarm manager"

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index c4c96f1..24f2ff4 100644 (file)
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -96,21 +96,22 @@ e2mgr:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-e2mgr
-    tag: 5.2.4
+    tag: 5.2.15
   privilegedmode: false
   globalRicId:
     ricId: "AACCE"
     mcc: "310"
     mnc: "411"
-  stateChangeMessageChannel: RAN_CONNECTION_STATUS_CHANGE
+  rnibWriter:
+    stateChangeMessageChannel: RAN_CONNECTION_STATUS_CHANGE
+    ranManipulationMessageChannel: RAN_MANIPULATION
 
 e2term:
   alpha:
     image:
       registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
       name: ric-plt-e2
-      tag: 4.4.1
-  
+      tag: 5.0.8
     privilegedmode: false
     hostnetworkmode: false
     env:

diff --git a/helm/e2mgr/templates/configmap.yaml b/helm/e2mgr/templates/configmap.yaml
index cb41e5f..a310608 100644 (file)
--- a/helm/e2mgr/templates/configmap.yaml
+++ b/helm/e2mgr/templates/configmap.yaml
@@ -148,11 +148,16 @@ data:
       mnc: "411"
       {{- end }}
       
-    {{- if hasKey .Values.e2mgr "stateChangeMessageChannel" }}
-    stateChangeMessageChannel: {{ .Values.e2mgr.stateChangeMessageChannel }}
-    {{- else }}
-    stateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"
-    {{- end }}
-      
+    rnibWriter:
+      {{- if hasKey .Values.e2mgr "stateChangeMessageChannel" }}
+      stateChangeMessageChannel: {{ .Values.e2mgr.stateChangeMessageChannel }}
+      {{- else }}
+      stateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"
+      {{- end }}
+      {{- if hasKey .Values.e2mgr "ranManipulationMessageChannel" }}
+      ranManipulationMessageChannel: {{ .Values.e2mgr.ranManipulationMessageChannel }}
+      {{- else }}
+      ranManipulationMessageChannel: "RAN_MANIPULATION"
+      {{- end }}
       
 ---

diff --git a/helm/e2term/templates/deployment.yaml b/helm/e2term/templates/deployment.yaml
index a58fc1b..b2aae0f 100644 (file)
--- a/helm/e2term/templates/deployment.yaml
+++ b/helm/e2term/templates/deployment.yaml
@@ -15,6 +15,7 @@
 #   limitations under the License.                                             #
 ################################################################################
 {{- $topCtx :=  . }}
+{{- $health := .Values.health }}
 {{- range keys .Values.e2term }}
 {{- $key := . }}
 {{- with index $topCtx.Values.e2term . }}
@@ -28,7 +29,7 @@ metadata:
   name: {{ include "common.deploymentname.e2term" $topCtx }}-{{ $key }}
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }}
@@ -36,7 +37,7 @@ spec:
   replicas: {{ .replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
   template:
     metadata:
@@ -90,7 +91,7 @@ spec:
           {{- end }}
         {{- end }}
       labels:
-        app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+        app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
         release: {{ $topCtx.Release.Name }}
     spec:
       hostname: {{ include "common.name.e2term" $topCtx }}-{{ $key }}
@@ -130,14 +131,27 @@ spec:
               containerPort: {{ include "common.serviceport.e2term.rmr.route" $topCtx }}
             - name: "rmrdata-{{ $key }}"
               containerPort: {{ include "common.serviceport.e2term.rmr.data" $topCtx }}
-            - name: "rmrsctp-{{ $key }}" 
+            - name: "sctp-{{ $key }}"
               containerPort: 36422
               protocol: SCTP 
           stdin: true
           tty: true
           securityContext:
             privileged: {{ .privilegedmode }}
-
+          {{- if eq $health.liveness.enabled true }}
+          readinessProbe:
+            exec:
+              command: [ "/bin/sh", "-c", "{{ $health.readiness.command }}:{{ include "common.serviceport.e2term.rmr.data" . }}" ]
+            initialDelaySeconds: {{ $health.readiness.initialDelaySeconds }}
+            periodSeconds: {{ $health.readiness.periodSeconds }}
+          {{- end }}
+          {{- if eq $health.liveness.enabled true }}
+          livenessProbe:
+            exec:
+              command: [ "/bin/sh", "-c", "{{ $health.liveness.command }}:{{ include "common.serviceport.e2term.rmr.data" . }}" ]
+            initialDelaySeconds: {{ $health.liveness.initialDelaySeconds }}
+            periodSeconds: {{ $health.liveness.periodSeconds }}
+          {{- end }}
 {{ if .pizpub.enabled }}
         - name: {{ include "common.containername.e2term" $topCtx }}-pizpub
           {{- $pizpubimagectx := dict "ctx" $topCtx "defaultregistry" .pizpub.image.registry }}

diff --git a/helm/e2term/templates/service-rmr.yaml b/helm/e2term/templates/service-rmr.yaml
index a708dfb..707856c 100644 (file)
--- a/helm/e2term/templates/service-rmr.yaml
+++ b/helm/e2term/templates/service-rmr.yaml
@@ -25,7 +25,7 @@ metadata:
   name: {{ include "common.servicename.e2term.rmr" $topCtx }}-{{ $key }}
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }} 
@@ -41,7 +41,7 @@ spec:
       targetPort: "rmrdata-{{ $key }}"
       name: "rmrdata-{{ $key }}"
   selector:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
 {{- end }}
 {{- end }}

diff --git a/helm/e2term/templates/service-sctp.yaml b/helm/e2term/templates/service-sctp.yaml
index b239fbc..d67ca22 100644 (file)
--- a/helm/e2term/templates/service-sctp.yaml
+++ b/helm/e2term/templates/service-sctp.yaml
@@ -25,7 +25,7 @@ metadata:
   name: {{ include "common.servicename.e2term.sctp" $topCtx }}-{{ $key }} 
   namespace: {{ include "common.namespace.platform" $topCtx }}
   labels:
-    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+    app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
     chart: {{ $topCtx.Chart.Name }}-{{ $topCtx.Chart.Version | replace "+" "_" }}
     release: {{ $topCtx.Release.Name }}
     heritage: {{ $topCtx.Release.Service }} 
@@ -36,9 +36,9 @@ spec:
       nodePort: {{ add 32222 $index }}
       protocol: "SCTP"
       targetPort: {{ include "common.serviceport.e2term.sctp" $topCtx }}
-      name: "rmrsctp-{{ $key }}"      
+      name: "sctp-{{ $key }}"
   selector:
-      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}
+      app: {{ include "common.namespace.platform" $topCtx }}-{{ include "common.name.e2term" $topCtx }}-{{ $key }}
       release: {{ $topCtx.Release.Name }}
 {{- end }}
 {{- end }}

diff --git a/helm/e2term/values.yaml b/helm/e2term/values.yaml
index 28be9bc..8d6674f 100644 (file)
--- a/helm/e2term/values.yaml
+++ b/helm/e2term/values.yaml
@@ -56,3 +56,16 @@ e2term:
     #    name: ""
     #    tag: ""
     #    registry: ""
+
+health:
+    liveness:
+      command: "/opt/e2/rmr_probe -h 0.0.0.0"
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      enabled: true
+
+    readiness:
+      command: "/opt/e2/rmr_probe -h 0.0.0.0"
+      initialDelaySeconds: 15
+      periodSeconds: 10
+      enabled: true

diff --git a/helm/rtmgr/templates/config.yaml b/helm/rtmgr/templates/config.yaml
index a3f921c..85a6ea9 100644 (file)
--- a/helm/rtmgr/templates/config.yaml
+++ b/helm/rtmgr/templates/config.yaml
@@ -89,6 +89,8 @@ data:
           "RAN_RESTARTED=1210",
           "RAN_RECONFIGURED=1220",
           "RIC_ENB_LOAD_INFORMATION=10020",
+          "RIC_SN_STATUS_TRANSFER=10040",
+          "RIC_UE_CONTEXT_RELEASE=10050",
           "RIC_X2_SETUP_REQ=10060",
           "RIC_X2_SETUP_RESP=10061",
           "RIC_X2_SETUP_FAILURE=10062",
@@ -100,12 +102,28 @@ data:
           "RIC_RES_STATUS_REQ=10090",
           "RIC_RES_STATUS_RESP=10091",
           "RIC_RES_STATUS_FAILURE=10092",
+          "RIC_SGNB_ADDITION_REQ=10270",
+          "RIC_SGNB_ADDITION_ACK=10271",
+          "RIC_SGNB_ADDITION_REJECT=10272",
+          "RIC_SGNB_RECONF_COMPLETE=10280",
+          "RIC_SGNB_MOD_REQUEST=10290",
+          "RIC_SGNB_MOD_REQUEST_ACK=10291",
+          "RIC_SGNB_MOD_REQUEST_REJ=10292",
+          "RIC_SGNB_MOD_REQUIRED=10300",
+          "RIC_SGNB_MOD_CONFIRM=10301",
+          "RIC_SGNB_MOD_REFUSE=10302",
+          "RIC_SGNB_RELEASE_REQUEST=10310",
+          "RIC_SGNB_RELEASE_REQUEST_ACK=10311",
+          "RIC_SGNB_RELEASE_REQUIRED=10320",
+          "RIC_SGNB_RELEASE_CONFIRM=10321",
+          "RIC_RRC_TRANSFER=10350",
           "RIC_ENDC_X2_SETUP_REQ=10360",
           "RIC_ENDC_X2_SETUP_RESP=10361",
           "RIC_ENDC_X2_SETUP_FAILURE=10362",
           "RIC_ENDC_CONF_UPDATE=10370",
           "RIC_ENDC_CONF_UPDATE_ACK=10371",
           "RIC_ENDC_CONF_UPDATE_FAILURE=10372",
+          "RIC_SECONDARY_RAT_DATA_USAGE_REPORT=10380",
           "RIC_E2_SETUP_REQ=12001",
           "RIC_E2_SETUP_RESP=12002",
           "RIC_E2_SETUP_FAILURE=12003",
@@ -116,6 +134,10 @@ data:
           "RIC_SUB_DEL_REQ=12020",
           "RIC_SUB_DEL_RESP=12021",
           "RIC_SUB_DEL_FAILURE=12022",
+          "RIC_CONTROL_REQ=12040",
+          "RIC_CONTROL_ACK=12041",
+          "RIC_CONTROL_FAILURE=12042",
+          "RIC_INDICATION=12050",
           "A1_POLICY_REQ=20010",
           "A1_POLICY_RESP=20011",
           "A1_POLICY_QUERY=20012",