Add missing suffixes to service name URLs

E2 Manager requires suffix /v1
xApp Manager requires suffix /ric/v1
Drop the unneeded enabled flag for mocking E2 names.

Change-Id: I4894087d0ddbc683caa32cae0b01ad1d699c37dd
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>

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 ca02cb7..837f4b1 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,8 +29,6 @@ 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 }}
+    # mock names for R1 testing, empty or missing entry disables the mock
+    e2mgr.mock.rannames = {{ .Values.dashboard.properties.e2mgr.mock.rannames }}
     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 09c1835..2b8e9a4 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
@@ -35,14 +35,18 @@ dashboard:
     name: dashboard-service
   # config URLs must be specified at deployment
   properties:
+    # These URLs use K8S/Kong service names
     a1med:
+      # no suffix required
       url:  http://ricplt-entry/a1mediator
     anrxapp:
+      # no suffix required
       url:  http://ricxapp-entry/anr
     e2mgr:
-      url:  http://ricplt-entry/e2mgr
+      # suffix must be "/v1"
+      url:  http://ricplt-entry/e2mgr/v1
       mock:
-        enabled: true
-        rannames: #Enable mock with CSV; e.g., ABCD123456, EFGH123456
+        rannames: "" # mock with CSV: "ABCD123456, EFGH123456"
     xappmgr:
-      url:  http://ricplt-entry/appmgr
+      # suffix must be "/ric/v1"
+      url:  http://ricplt-entry/appmgr/ric/v1