Changes in helm chart due to xapp-fwk adaptation in rtmgr

Change-Id: Ib791831756475630718829c57546e5ed10882afd
Signed-off-by: wahidw <abdulwahid.w@nokia.com>

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml
index 997ae4f..f45dc98 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/config.yaml
@@ -28,29 +28,51 @@ data:
   # FQDN and port info of the platform components for routing manager to form
   # and distribute corresponding routes to them
   rtmgrcfg: |
-    {
        "PlatformComponents":
-       [
-          {
-             "name": "E2TERM",
-             "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2term.rmr" .) (include "common.namespace.platform" .) }}",
-             "port": {{ include "common.serviceport.e2term.rmr.data" . }}
-          },
-          {
-             "name": "SUBMAN",
-             "fqdn": "{{ printf "%s.%s" (include "common.servicename.submgr.rmr" .) (include "common.namespace.platform" .) }}",
-             "port": {{ include "common.serviceport.submgr.rmr.data" . }}
-          },
-          {
-             "name": "E2MAN",
-             "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2mgr.rmr" .) (include "common.namespace.platform" .) }}",
-             "port": {{ include "common.serviceport.e2mgr.rmr.data" . }}
-          },
-          {
-             "name": "RSM",
-             "fqdn": "{{ printf "%s.%s" (include "common.servicename.rsm.rmr" .) (include "common.namespace.platform" .) }}",
-             "port": {{ include "common.serviceport.rsm.rmr.data" . }}
-          }
-       ]
-    }
+         -
+           "name": "E2TERM"
+           "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2term.rmr" .) (include "common.namespace.platform" .) }}"
+           "port": {{ include "common.serviceport.e2term.rmr.data" . }}
+         -
+           "name": "SUBMAN"
+           "fqdn": "{{ printf "%s.%s" (include "common.servicename.submgr.rmr" .) (include "common.namespace.platform" .) }}"
+           "port": {{ include "common.serviceport.submgr.rmr.data" . }}
+         -
+           "name": "E2MAN"
+           "fqdn": "{{ printf "%s.%s" (include "common.servicename.e2mgr.rmr" .) (include "common.namespace.platform" .) }}"
+           "port": {{ include "common.serviceport.e2mgr.rmr.data" . }}
+         -
+           "name": "RSM"
+           "fqdn": "{{ printf "%s.%s" (include "common.servicename.rsm.rmr" .) (include "common.namespace.platform" .) }}"
+           "port": {{ include "common.serviceport.rsm.rmr.data" . }}
+         -
+           "name": "A1MEDIATOR"
+           "fqdn": "{{ printf "%s.%s" (include "common.servicename.a1mediator.rmr" .) (include "common.namespace.platform" .) }}"
+           "port": {{ include "common.serviceport.a1mediator.rmr.data" . }}
 
+       "XMURL":
+         "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps"
+       "RTFILE":
+         "/db/rt.json"
+       "CFGFILE":
+         "/cfg/rtmgr-config.yaml"
+       "RPE":
+         "{{ .Values.rtmgr.rpe }}"
+       "SBI":
+         "{{ .Values.rtmgr.sbi }}"
+       "SBIURL":
+         "{{ .Values.rtmgr.sbiurl }}"
+       "NBI":
+         "{{ .Values.rtmgr.nbi }}"
+       "NBIURL":
+         "http://{{ include "common.servicename.rtmgr.http" . }}:{{ include "common.serviceport.rtmgr.http" . }}"
+       "SDL":
+         "file"
+       "local":
+         "host": ":8080"
+       "logger":
+         "level": 4
+       "rmr":
+         "protPort": "tcp:4560"
+         "maxSize": 2072
+         "numWorkers": 1

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
index ee0878e..b5db46c 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
@@ -71,5 +71,5 @@ spec:
             name: {{ include "common.configmapname.rtmgr" . }}-rtmgrcfg
             items:
               - key: rtmgrcfg
-                path: rtmgr-config.json
+                path: rtmgr-config.yaml
                 mode: 0644

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
index 2fb3115..564529b 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
@@ -24,12 +24,7 @@ data:
    DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
    DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
    RMR_RTG_SVC: {{ include "common.serviceport.rtmgr.rmr.route" . | quote }}
+   CFGFILE: "/cfg/rtmgr-config.yaml"
+   #RMR_SEED_RT: "/uta_rtg_ric.rt"
+   #RMR_SRC_ID: "service-ricplt-rtmgr-rmr.ricplt"
    XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps"
-   RTFILE: "/db/rt.json"
-   CFGFILE: "/cfg/rtmgr-config.json"
-   RPE: "{{ .Values.rtmgr.rpe }}"
-   SBI: "{{ .Values.rtmgr.sbi }}"
-   SBIURL: "{{ .Values.rtmgr.sbiurl }}"
-   NBI: "{{ .Values.rtmgr.nbi }}"
-   NBIURL: "http://{{ include "common.servicename.rtmgr.http" . }}:{{ include "common.serviceport.rtmgr.http" . }}"
-   LOGLEVEL: "{{ .Values.rtmgr.loglevel }}"

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml
index 1b989b0..d32f718 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/values.yaml
@@ -44,7 +44,6 @@ rtmgr:
   sbiurl: 0.0.0.0
   nbi: httpRESTful
   nbiurl: http://0.0.0.0:8888
-  loglevel: DEBUG
 
   # Service ports are now defined in 
   # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.