From: Lusheng Ji <lji@research.att.com>
Date: Thu, 26 Mar 2020 17:36:23 +0000 (+0000)
Subject: Merge "[RIC-213] Add olmnId and nearRtRicId to HelmChart + remove env var RIC_ID"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=276a64e770e29b52effcb0fc224b94c8e324e5b2;hp=5044c160f60da0cc9f1801d358bf0aa675cfe0b3;p=ric-plt%2Fric-dep.git

Merge "[RIC-213] Add olmnId and nearRtRicId to HelmChart + remove env var RIC_ID"
---

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index c86a166..d72e25d 100644
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -101,8 +101,9 @@ e2mgr:
     name: ric-plt-e2mgr
     tag: 2.0.10
   privilegedmode: false
-  env:
-    RIC_ID: "bbbccc-abcd0e/20"
+  globalRicId:
+    plmnId: 131014
+    ricNearRtId: 556670
 
 
 e2term:
diff --git a/helm/e2mgr/templates/configmap.yaml b/helm/e2mgr/templates/configmap.yaml
index 57ecf4f..fd7ae2d 100644
--- a/helm/e2mgr/templates/configmap.yaml
+++ b/helm/e2mgr/templates/configmap.yaml
@@ -130,4 +130,16 @@ data:
     {{- else }}
     keepAliveDelayMs: 120000
     {{- end }}
+
+    globalRicId:
+      {{- if hasKey .Values.e2mgr "plmnId" }}
+      plmnId: {{ .Values.e2mgr.plmnId }}
+      {{- else }}
+      plmnId: 131014
+      {{- end }}
+      {{- if hasKey .Values.e2mgr "ricNearRtId" }}
+      ricNearRtId: {{ .Values.e2mgr.ricNearRtId }}
+      {{- else }}
+      ricNearRtId: 556670
+      {{- end }}
 ---
diff --git a/helm/e2mgr/values.yaml b/helm/e2mgr/values.yaml
index 7de686c..c86b3bd 100644
--- a/helm/e2mgr/values.yaml
+++ b/helm/e2mgr/values.yaml
@@ -31,8 +31,9 @@ e2mgr:
   
   replicaCount: 1
   
-  env:
-    RIC_ID: "bbbccc-abcd0e/20"
+  globalRicId:
+    plmnId: 131014
+    ricNearRtId: 556670
 
 
   # Service ports are now defined in