-/* Header file defining message types
- for various RMR messages
+/* Header file defining message types
+ for various RMR messages
------------------
*/
-#define RIC_UNDEFINED -1
+#define RIC_UNDEFINED -1
-/* E2 Related messages should be in the range
- 10000 to 99999
-*/
+// ---- RESERVED -------------------------------------------
+// all message types 0 - 99 are reserved for RMR
+// ---------------------------------------------------------
-#define RIC_X2_SETUP 10000
-#define RIC_X2_RESPONSE 10001
-#define RIC_X2_RESOURCE_STATUS_REQUEST 10002
-#define RIC_X2_RESOURCE_STATUS_RESPONSE 10003
-#define RIC_X2_LOAD_INFORMATION 10004
-#define RIC_E2_TERMINATION_HC_REQUEST 10005
-#define RIC_E2_TERMINATION_HC_RESPONSE 10006
-#define RIC_E2_MANAGER_HC_REQUEST 10007
-#define RIC_E2_MANAGER_HC_RESPONSE 10008
+// --- please keep additions in numerical order ------
+#define RIC_SCTP_CONNECTION_FAILURE 1080
+#define RIC_SCTP_CLEAR_ALL 1090
+
+#define E2_TERM_INIT 1100
+
+#define RIC_ENB_LOAD_INFORMATION 10020
+
+#define RIC_ERROR_INDICATION 10030
+
+#define RIC_UE_CONTEXT_RELEASE 10050
+
+#define RIC_X2_SETUP_REQ 10060
+#define RIC_X2_SETUP_RESP 10061
+#define RIC_X2_SETUP_FAILURE 10062
+#define RIC_X2_RESET 10070
+#define RIC_X2_RESET_RESP 10071
+
+#define RIC_ENB_CONF_UPDATE 10080
+#define RIC_ENB_CONF_UPDATE_ACK 10081
+#define RIC_ENB_CONF_UPDATE_FAILURE 10082
+
+#define RIC_RES_STATUS_REQ 10090
+#define RIC_RES_STATUS_RESP 10091
+#define RIC_RES_STATUS_FAILURE 10092
+
+#define RIC_RESOURCE_STATUS_UPDATE 10100
+
+#define RIC_SGNB_ADDITION_REQ 10270
+#define RIC_SGNB_ADDITION_ACK 10271
+#define RIC_SGNB_ADDITION_REJECT 10272
+#define RIC_SGNB_RECONF_COMPLETE 10280
+
+#define RIC_RRC_TRANSFER 10350
+
+#define RIC_ENDC_X2_SETUP_REQ 10360
+#define RIC_ENDC_X2_SETUP_RESP 10361
+#define RIC_ENDC_X2_SETUP_FAILURE 10362
+
+#define RIC_ENDC_CONF_UPDATE 10370
+#define RIC_ENDC_CONF_UPDATE_ACK 10371
+#define RIC_ENDC_CONF_UPDATE_FAILURE 10372
+
+#define RIC_GNB_STATUS_INDICATION 10450
-/* A1 Related messages should be in the range
- 100000 to 999999
-*/
-#define RIC_CONTROL_XAPP_CONFIG_REQUEST 100000
-#define RIC_CONTROL_XAPP_CONFIG_RESPONSE 100001
-// ---------------------------------------------------------
#define RIC_SUB_REQ 12010
#define RIC_SUB_RESP 12011
#define RIC_SUB_FAILURE 12012
+
#define RIC_SUB_DEL_REQ 12020
#define RIC_SUB_DEL_RESP 12021
#define RIC_SUB_DEL_FAILURE 12022
#define RIC_CONTROL_FAILURE 12042
#define RIC_INDICATION 12050
+
#define RIC_SERVICE_QUERY 12060
-#define RIC_X2_SETUP_REQ 10060
-#define RIC_X2_SETUP_RESP 10061
-#define RIC_X2_SETUP_FAILURE 10062
-#define RIC_X2_RESET 10070
+#define DC_ADM_INT_CONTROL 20000
+#define DC_ADM_INT_CONTROL_ACK 20001
+#define DC_ADM_GET_POLICY 20002
+#define DC_ADM_GET_POLICY_ACK 20003
-#define RIC_ENDC_X2_SETUP_REQ 10360
-#define RIC_ENDC_X2_SETUP_RESP 10361
-#define RIC_ENDC_X2_SETUP_FAILURE 10362
-#define RIC_ENDC_CONF_UPDATE 10370
-#define RIC_ENDC_CONF_UPDATE_ACK 10371
-#define RIC_ENDC_CONF_UPDATE_FAILURE 10372
-#define RIC_RES_STATUS_REQ 10090
-#define RIC_RES_STATUS_RESP 10091
-#define RIC_RES_STATUS_FAILURE 10092
-#define RIC_ENB_CONF_UPDATE 10080
-#define RIC_ENB_CONF_UPDATE_ACK 10081
-#define RIC_ENB_CONF_UPDATE_FAILURE 10082
-#define RIC_ENB_LOAD_INFORMATION 10020
+// ---- these are old (release 0) definitions and should not be used ------
-#define RIC_GNB_STATUS_INDICATION 10450
+/* E2 Related messages should be in the range
+ 10000 to 99999
+*/
-#define RIC_RESOURCE_STATUS_UPDATE 10100
+#define RIC_X2_SETUP 10000
+#define RIC_X2_RESPONSE 10001
+#define RIC_X2_RESOURCE_STATUS_REQUEST 10002
+#define RIC_X2_RESOURCE_STATUS_RESPONSE 10003
+#define RIC_X2_LOAD_INFORMATION 10004
+#define RIC_E2_TERMINATION_HC_REQUEST 10005
+#define RIC_E2_TERMINATION_HC_RESPONSE 10006
+#define RIC_E2_MANAGER_HC_REQUEST 10007
+#define RIC_E2_MANAGER_HC_RESPONSE 10008
-#define RIC_ERROR_INDICATION 10030
-#define DC_ADM_INT_CONTROL 20000
-#define DC_ADM_INT_CONTROL_ACK 20001
+/* A1 Related messages should be in the range
+ 100000 to 999999
+*/
+#define RIC_CONTROL_XAPP_CONFIG_REQUEST 100000
+#define RIC_CONTROL_XAPP_CONFIG_RESPONSE 100001