From: wahidw <abdulwahid.w@nokia.com>
Date: Thu, 25 Jun 2020 07:36:16 +0000 (+0000)
Subject: RMR Message Type configurable and added liveness/readiness check for rtmgr
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=8c5a055df26ad72db7c8882fcdbebe45baf7dc2b;p=ric-plt%2Fric-dep.git

RMR Message Type configurable and added liveness/readiness check for rtmgr

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

diff --git a/RECIPE_EXAMPLE/example_recipe.yaml b/RECIPE_EXAMPLE/example_recipe.yaml
index 0181bbd..c4c96f1 100644
--- a/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/RECIPE_EXAMPLE/example_recipe.yaml
@@ -145,12 +145,7 @@ rtmgr:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-rtmgr
-    tag: 0.6.1
-  rpe: rmrpush
-  sbi: nngpush
-  sbiurl: 0.0.0.0
-  nbi: httpRESTful
-  nbiurl: http://0.0.0.0:8888
+    tag: 0.6.3
 
 submgr:
   image:
@@ -187,4 +182,4 @@ alarmadapter:
   image:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
     name: ric-plt-alarmadapter
-    tag: 0.4.5
\ No newline at end of file
+    tag: 0.4.5
diff --git a/helm/rtmgr/templates/config.yaml b/helm/rtmgr/templates/config.yaml
index 07b05d6..a3f921c 100644
--- a/helm/rtmgr/templates/config.yaml
+++ b/helm/rtmgr/templates/config.yaml
@@ -72,10 +72,61 @@ data:
          "level": 4
        "rmr":
          "protPort": "tcp:4560"
-         "maxSize": 4096
+         "maxSize": 1024
          "numWorkers": 1
          "threadType": 1
-       "maxrecord": 50
+       "messagetypes": [
+          "RIC_HEALTH_CHECK_REQ=100",
+          "RIC_HEALTH_CHECK_RESP=101",
+          "RIC_ALARM=110",
+          "RIC_ALARM_QUERY=111",
+          "RIC_SCTP_CONNECTION_FAILURE=1080",
+          "E2_TERM_INIT=1100",
+          "E2_TERM_KEEP_ALIVE_REQ=1101",
+          "E2_TERM_KEEP_ALIVE_RESP=1102",
+          "RIC_SCTP_CLEAR_ALL=1090",
+          "RAN_CONNECTED=1200",
+          "RAN_RESTARTED=1210",
+          "RAN_RECONFIGURED=1220",
+          "RIC_ENB_LOAD_INFORMATION=10020",
+          "RIC_X2_SETUP_REQ=10060",
+          "RIC_X2_SETUP_RESP=10061",
+          "RIC_X2_SETUP_FAILURE=10062",
+          "RIC_X2_RESET=10070",
+          "RIC_X2_RESET_RESP=10071",
+          "RIC_ENB_CONF_UPDATE=10080",
+          "RIC_ENB_CONF_UPDATE_ACK=10081",
+          "RIC_ENB_CONF_UPDATE_FAILURE=10082",
+          "RIC_RES_STATUS_REQ=10090",
+          "RIC_RES_STATUS_RESP=10091",
+          "RIC_RES_STATUS_FAILURE=10092",
+          "RIC_ENDC_X2_SETUP_REQ=10360",
+          "RIC_ENDC_X2_SETUP_RESP=10361",
+          "RIC_ENDC_X2_SETUP_FAILURE=10362",
+          "RIC_ENDC_CONF_UPDATE=10370",
+          "RIC_ENDC_CONF_UPDATE_ACK=10371",
+          "RIC_ENDC_CONF_UPDATE_FAILURE=10372",
+          "RIC_E2_SETUP_REQ=12001",
+          "RIC_E2_SETUP_RESP=12002",
+          "RIC_E2_SETUP_FAILURE=12003",
+          "RIC_ERROR_INDICATION=12007",
+          "RIC_SUB_REQ=12010",
+          "RIC_SUB_RESP=12011",
+          "RIC_SUB_FAILURE=12012",
+          "RIC_SUB_DEL_REQ=12020",
+          "RIC_SUB_DEL_RESP=12021",
+          "RIC_SUB_DEL_FAILURE=12022",
+          "A1_POLICY_REQ=20010",
+          "A1_POLICY_RESP=20011",
+          "A1_POLICY_QUERY=20012",
+          "TS_UE_LIST=30000",
+          "TS_QOE_PRED_REQ=30001",
+          "TS_QOE_PREDICTION=30002",
+          "MC_REPORT=30010",
+          "DCAPTERM_RTPM_RMR_MSGTYPE=33001",
+          "DCAPTERM_GEO_RMR_MSGTYPE=33002",
+          ]
+
        "PlatformRoutes": [
          { 'messagetype': 'RIC_SUB_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1, 'endpoint': '', 'meid': '%meid'},
          { 'messagetype': 'RIC_SUB_DEL_REQ', 'senderendpoint': 'SUBMAN', 'subscriptionid': -1,'endpoint': '', 'meid': '%meid'},
diff --git a/helm/rtmgr/templates/deployment.yaml b/helm/rtmgr/templates/deployment.yaml
index 4dbb5d3..7854a89 100644
--- a/helm/rtmgr/templates/deployment.yaml
+++ b/helm/rtmgr/templates/deployment.yaml
@@ -68,6 +68,21 @@ spec:
               containerPort: {{ include "common.serviceport.rtmgr.rmr.route" . }}
             - name: "rmrdata"
               containerPort: {{ include "common.serviceport.rtmgr.rmr.data" . }}
+
+          livenessProbe:
+            httpGet:
+              path: ric/v1/health/alive
+              port: 8080
+            initialDelaySeconds: 5
+            periodSeconds: 15
+
+          readinessProbe:
+            httpGet:
+              path: ric/v1/health/ready
+              port: 8080
+            initialDelaySeconds: 5
+            periodSeconds: 15
+    
       volumes:
         - name: "rtmgrcfg"
           configMap:
diff --git a/helm/rtmgr/values.yaml b/helm/rtmgr/values.yaml
index 3e0a6e7..bfa68dd 100644
--- a/helm/rtmgr/values.yaml
+++ b/helm/rtmgr/values.yaml
@@ -22,7 +22,7 @@ rtmgr:
     registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
   
   rpe: rmrpush
-  sbi: nngpush
+  sbi: rmrpush
   sbiurl: 0.0.0.0
   nbi: httpRESTful
   nbiurl: http://0.0.0.0:8888