Fix helm chart bugs that fail the verify job

Issue-ID: INT-109
Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: I80aee0be7713ec96b5cd47dab6b7365233a74210

diff --git a/helm/e2mgr/templates/env.yaml b/helm/e2mgr/templates/env.yaml
index 3c95c5b..c17aa26 100644 (file)
--- a/helm/e2mgr/templates/env.yaml
+++ b/helm/e2mgr/templates/env.yaml
@@ -25,6 +25,5 @@ data:
    DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
    RMR_RTG_SVC: {{ include "common.serviceport.e2mgr.rmr.route" . | quote }}
    RMR_SRC_ID: {{ include "common.servicename.e2mgr.rmr" . }}.{{ include "common.namespace.platform" . }}
-   RIC_ID: "{{ .Values.e2mgr.env.RIC_ID }}"
    #nano: {{ include "common.serviceport.e2mgr.rmr.data" . | quote }}
 

diff --git a/helm/rtmgr/templates/config.yaml b/helm/rtmgr/templates/config.yaml
index abbf2f0..551472a 100644 (file)
--- a/helm/rtmgr/templates/config.yaml
+++ b/helm/rtmgr/templates/config.yaml
@@ -94,7 +94,7 @@ data:
          { 'messagetype': 'RIC_ENB_CONF_UPDATE_FAILURE', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
          { 'messagetype': 'RIC_ENDC_CONF_UPDATE_ACK', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
          { 'messagetype': 'RIC_ENDC_CONF_UPDATE_FAILURE', 'senderendpoint': 'E2MAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
-                { 'messagetype': 'RIC_E2_SETUP_REQ', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
+         { 'messagetype': 'RIC_E2_SETUP_REQ', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
          { 'messagetype': 'E2_TERM_INIT', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
          { 'messagetype': 'RIC_X2_SETUP_RESP', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},
          { 'messagetype': 'RIC_X2_SETUP_FAILURE', 'senderendpoint': '', 'subscriptionid': -1, 'endpoint': 'E2MAN', 'meid': ''},