From b01abe7a4f8a5ca70bbf75ce385b99bf52241d3c Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Wed, 15 Apr 2020 10:59:51 +0000
Subject: [PATCH] Removed E2TERM entry and changed maxSize parameter of rmr

Change-Id: I8470ccbe0e57db1e8bef8b4e71c21fc9ba51b1ea
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 helm/alarmadapter/templates/deployment.yaml | 2 ++
 helm/alarmadapter/templates/env.yaml        | 4 ----
 helm/rtmgr/templates/config.yaml            | 7 ++-----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/helm/alarmadapter/templates/deployment.yaml b/helm/alarmadapter/templates/deployment.yaml
index 4a9870d..2a98220 100644
--- a/helm/alarmadapter/templates/deployment.yaml
+++ b/helm/alarmadapter/templates/deployment.yaml
@@ -55,6 +55,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ include "common.configmapname.alarmadapter" . }}-env
+            - configMapRef:
+                name: {{ include "common.configmapname.dbaas" . }}-appconfig
           volumeMounts:
             - mountPath: /cfg
               name: config-volume
diff --git a/helm/alarmadapter/templates/env.yaml b/helm/alarmadapter/templates/env.yaml
index 84dd783..545b266 100644
--- a/helm/alarmadapter/templates/env.yaml
+++ b/helm/alarmadapter/templates/env.yaml
@@ -18,10 +18,6 @@ kind: ConfigMap
 metadata:
   name: {{ include "common.configmapname.alarmadapter" . }}-env
 data:
-  DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
-  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.alarmadapter.rmr.route" . | quote }}
   RMR_SRC_ID: {{ include "common.servicename.alarmadapter.rmr" . }}.{{ include "common.namespace.platform" . }}
   CFGFILE: "/cfg/alarmadapter-config.yaml"
diff --git a/helm/rtmgr/templates/config.yaml b/helm/rtmgr/templates/config.yaml
index 551472a..07b05d6 100644
--- a/helm/rtmgr/templates/config.yaml
+++ b/helm/rtmgr/templates/config.yaml
@@ -29,10 +29,6 @@ data:
   # 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" .) }}"
@@ -76,9 +72,10 @@ data:
          "level": 4
        "rmr":
          "protPort": "tcp:4560"
-         "maxSize": 2072
+         "maxSize": 4096
          "numWorkers": 1
          "threadType": 1
+       "maxrecord": 50
        "PlatformRoutes": [
          { 'messagetype': 'RIC_SUB_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
          { 'messagetype': 'RIC_SUB_DEL_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1,'endpoint': '', 'meid': '%meid'},
-- 
2.16.6