From 7af8d2ef69907ef1032950b72b43e8737260c4ef Mon Sep 17 00:00:00 2001
From: ss412g <shuky.har-noy@intl.att.com>
Date: Wed, 24 Jun 2020 22:28:21 +0300
Subject: [PATCH] [RIC-442, RIC-397] - R5: Update globalRicId and add
 stateChangeMessageChannel in E2M configMap and in example_recipe

Change-Id: I64e840caa8602d1c4a8626757d5c71f7bc8bba43
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>
---
 RECIPE_EXAMPLE/example_recipe.yaml  |  9 +++++----
 helm/e2mgr/templates/configmap.yaml | 25 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

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 }}
+      
+      
 ---
-- 
2.16.6