From: Lusheng Ji <lji@research.att.com>
Date: Mon, 29 Jun 2020 14:35:53 +0000 (+0000)
Subject: Merge "[RIC-357] R5 - DevOps: E2M to implement K8S healthcheck"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2a1217ff33ddda7be24da407f1355b1eda5b4bef;hp=d14e333bf6e5eac5a96dde13c6a52d601c9233f6;p=ric-plt%2Fric-dep.git

Merge "[RIC-357] R5 - DevOps: E2M to implement K8S healthcheck"
---

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index 4d76364..0181bbd 100644
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -96,12 +96,13 @@ e2mgr:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-e2mgr
-    tag: 4.4.12
+    tag: 5.2.4
   privilegedmode: false
   globalRicId:
-    plmnId: "13F184"
-    ricNearRtId: 556670
-
+    ricId: "AACCE"
+    mcc: "310"
+    mnc: "411"
+  stateChangeMessageChannel: RAN_CONNECTION_STATUS_CHANGE
 
 e2term:
   alpha:
diff --git a/helm/e2mgr/templates/configmap.yaml b/helm/e2mgr/templates/configmap.yaml
index 13175f0..cb41e5f 100644
--- a/helm/e2mgr/templates/configmap.yaml
+++ b/helm/e2mgr/templates/configmap.yaml
@@ -132,14 +132,27 @@ data:
     {{- end }}
 
     globalRicId:
-      {{- if hasKey .Values.e2mgr "plmnId" }}
-      plmnId: {{ .Values.e2mgr.plmnId }}
+      {{- if hasKey .Values.e2mgr "ricId" }}
+      ricId: {{ .Values.e2mgr.ricId }}
       {{- else }}
-      plmnId: 131014
+      ricId: "AACCE"
       {{- end }}
-      {{- if hasKey .Values.e2mgr "ricNearRtId" }}
-      ricNearRtId: {{ .Values.e2mgr.ricNearRtId }}
+      {{- if hasKey .Values.e2mgr "mcc" }}
+      mcc: {{ .Values.e2mgr.mcc }}
       {{- else }}
-      ricNearRtId: 556670
+      mcc: "310"
       {{- end }}
+      {{- if hasKey .Values.e2mgr "mnc" }}
+      mnc: {{ .Values.e2mgr.mnc }}
+      {{- else }}
+      mnc: "411"
+      {{- end }}
+      
+    {{- if hasKey .Values.e2mgr "stateChangeMessageChannel" }}
+    stateChangeMessageChannel: {{ .Values.e2mgr.stateChangeMessageChannel }}
+    {{- else }}
+    stateChangeMessageChannel: "RAN_CONNECTION_STATUS_CHANGE"
+    {{- end }}
+      
+      
 ---