Merge "Extend properties for mock RAN name list in R1"

diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index 4da8da1..2510331 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@ -56,7 +56,11 @@ dashboard:
   image:
     name:: ric-dash-be
     tag: 1.0.5
+  properties:
+    e2mgr:
+      mock:
+        rannames: "ABCD123456, EFGH123456"
 
 ext:
   ip:
-    192.168.130.110
+    192.168.130.110
\ No newline at end of file

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
index 2930a15..ca02cb7 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
@@ -29,4 +29,8 @@ data:
     a1med.url =   {{ .Values.dashboard.properties.a1med.url   }}
     anrxapp.url = {{ .Values.dashboard.properties.anrxapp.url }}
     e2mgr.url =   {{ .Values.dashboard.properties.e2mgr.url   }}
+    {{- if .Values.dashboard.properties.e2mgr.mock.enabled }}
+      # mock names for R1 testing, removing this entry disables the mock
+      e2mgr.mock.rannames = {{ .Values.dashboard.properties.e2mgr.mock.rannames }}
+    {{- end }}
     xappmgr.url = {{ .Values.dashboard.properties.xappmgr.url }}

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
index f838483..09c1835 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
@@ -41,5 +41,8 @@ dashboard:
       url:  http://ricxapp-entry/anr
     e2mgr:
       url:  http://ricplt-entry/e2mgr
+      mock:
+        enabled: true
+        rannames: #Enable mock with CSV; e.g., ABCD123456, EFGH123456
     xappmgr:
       url:  http://ricplt-entry/appmgr