[RIC-434] Update custom configmaps and e2t nodeport

Change-Id: Ic8976c0888667bd374b4ebac933737d6d7c3ca80
Signed-off-by: idanshal <idan.shalom@intl.att.com>

diff --git a/Automation/Tests/Update_GNB/Update_gnb_happy.robot b/Automation/Tests/Update_GNB/Update_gnb_happy.robot
index 87d18e6..733ca3f 100644 (file)
--- a/Automation/Tests/Update_GNB/Update_gnb_happy.robot
+++ b/Automation/Tests/Update_GNB/Update_gnb_happy.robot
@@ -27,6 +27,8 @@ Suite Setup   Prepare Enviorment  ${True}
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
 Library     OperatingSystem
+Library     ../Scripts/log_scripts.py
+Library     ../Scripts/k8s_helper.py
 Library     REST        ${url}
 
 

diff --git a/tools/cm_e2mgr_ide/rtmgr_config.yaml b/tools/cm_e2mgr_ide/rtmgr_config.yaml
index 148a34c..eae55cf 100644 (file)
--- a/tools/cm_e2mgr_ide/rtmgr_config.yaml
+++ b/tools/cm_e2mgr_ide/rtmgr_config.yaml
@@ -56,7 +56,7 @@ data:
        "RPE":
          "rmrpush"
        "SBI":
-         "nngpush"
+         "rmrpush"
        "SBIURL":
          "0.0.0.0"
        "NBI":
@@ -71,10 +71,60 @@ data:
          "level": 4
        "rmr":
          "protPort": "tcp:31500"
-         "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/tools/cm_e2mgr_k8s/rtmgr_config.yaml b/tools/cm_e2mgr_k8s/rtmgr_config.yaml
index ecdd2d5..6fb0449 100644 (file)
--- a/tools/cm_e2mgr_k8s/rtmgr_config.yaml
+++ b/tools/cm_e2mgr_k8s/rtmgr_config.yaml
@@ -56,7 +56,7 @@ data:
        "RPE":
          "rmrpush"
        "SBI":
-         "nngpush"
+         "rmrpush"
        "SBIURL":
          "0.0.0.0"
        "NBI":
@@ -71,10 +71,60 @@ 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/tools/k8s_svc_nodeports/svc_e2t_rmr_tcp.yaml b/tools/k8s_svc_nodeports/svc_e2t_rmr_tcp.yaml
index 042c8e9..e243393 100644 (file)
--- a/tools/k8s_svc_nodeports/svc_e2t_rmr_tcp.yaml
+++ b/tools/k8s_svc_nodeports/svc_e2t_rmr_tcp.yaml
@@ -21,7 +21,7 @@ metadata:
   name: service-ricplt-e2term-rmr-alpha-nodeport
   namespace: ricplt
   labels:
-    app: ricplt-e2term
+    app: ricplt-e2term-alpha
     chart: e2term-3.0.0
     release: r4-e2term
     heritage: Tiller
@@ -34,6 +34,6 @@ spec:
       targetPort: 30500
       name: "e2term-rmr-tcp-nodeport"      
   selector:
-      app: ricplt-e2term
+      app: ricplt-e2term-alpha
       release: r4-e2term