From: zkoczka Date: Tue, 29 Oct 2019 12:05:48 +0000 (+0100) Subject: Update platform routes X-Git-Tag: 0.3.9~5 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b95b07641ead78b5082484aa8a82c900f79c9706;p=ric-plt%2Frtmgr.git Update platform routes Signed-off-by: zkoczka Change-Id: I12b497d03c431ef2e21d956b7f90a8d7aa54ad68 Signed-off-by: zkoczka --- diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index 20cd4e9..7e01179 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -110,6 +110,9 @@ func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoin r.addRoute("RIC_SUB_DEL_REQ", xAppEp, subManEp, routeTable, -1) //xApp -> E2 Termination r.addRoute("RIC_CONTROL_REQ", xAppEp, e2TermEp, routeTable, -1) + //E2 Termination -> xApp + r.addRoute("RIC_CONTROL_ACK", e2TermEp, xAppEp, routeTable, -1) + r.addRoute("RIC_CONTROL_FAILURE", e2TermEp, xAppEp, routeTable, -1) } } @@ -154,21 +157,27 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.E //Platform Routes --- X2 Routes //E2 Manager -> E2 Termination r.addRoute("RIC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_X2_SETUP_RESP", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_X2_SETUP_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_X2_RESET_REQ", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_X2_RESET_RESP", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_SCTP_CLEAR_ALL", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_ENB_CONF_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_ENB_CONF_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_ENDC_CONF_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_ENDC_CONF_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1) //E2 Termination -> E2 Manager r.addRoute("E2_TERM_INIT", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_SETUP_REQ", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_X2_SETUP_RESP", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_RESET", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_RESOURCE_STATUS_RESPONSE", e2TermEp, e2ManEp, routeTable, -1) + r.addRoute("RIC_X2_SETUP_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_X2_RESET_REQ", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_X2_RESET_RESP", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_RESP", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_FAILURE", e2TermEp, e2ManEp, routeTable, -1) + r.addRoute("RIC_ENDC_CONF_UPDATE", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_SCTP_CONNECTION_FAILURE", e2TermEp, e2ManEp, routeTable, -1) + r.addRoute("RIC_ERROR_INDICATION", e2TermEp, e2ManEp, routeTable, -1) + r.addRoute("RIC_ENB_CONF_UPDATE", e2TermEp, e2ManEp, routeTable, -1) + r.addRoute("RIC_ENB_LOAD_INFORMATION", e2TermEp, e2ManEp, routeTable, -1) } func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable { diff --git a/pkg/rtmgr/rtmgr.go b/pkg/rtmgr/rtmgr.go index 1a27e40..2ab2eb7 100644 --- a/pkg/rtmgr/rtmgr.go +++ b/pkg/rtmgr/rtmgr.go @@ -38,64 +38,61 @@ var ( // CamelCase Message Types are for being able to test with old fashioned admin control xApps // TODO: Add a separate message definition file (Not using the one from RMR to not create dependency on that library). MessageTypes = map[string]string{ - "HandoverPreparation": "0", - "HandoverCancel": "1", - "LoadIndication": "2", - "ErrorIndication": "3", - "SNStatusTransfer": "4", - "UEContextRelease": "5", - "X2Setup": "6", - "Reset": "7", - "E2_TERM_INIT": "1100", - "RIC_SCTP_CLEAR_ALL": "1090", - "RIC_SCTP_CONNECTION_FAILURE": "1080", - "RIC_X2_SETUP": "10000", - "RIC_X2_RESPONSE": "10001", - "RIC_X2_RESOURCE_STATUS_REQUEST": "10002", - "RIC_X2_RESOURCE_STATUS_RESPONSE": "10003", - "RIC_X2_LOAD_INFORMATION": "10004", - "RIC_E2_TERMINATION_HC_REQUEST": "10005", - "RIC_E2_TERMINATION_HC_RESPONSE": "10006", - "RIC_E2_MANAGER_HC_REQUEST": "10007", - "RIC_E2_MANAGER_HC_RESPONSE": "10008", + "HandoverPreparation": "0", + "HandoverCancel": "1", + "LoadIndication": "2", + "ErrorIndication": "3", + "SNStatusTransfer": "4", + "UEContextRelease": "5", + "X2Setup": "6", + "Reset": "7", + "E2_TERM_INIT": "1100", + "RIC_SCTP_CLEAR_ALL": "1090", + "RIC_SCTP_CONNECTION_FAILURE": "1080", + "RIC_X2_SETUP": "10000", + "RIC_X2_RESPONSE": "10001", + "RIC_X2_RESOURCE_STATUS_REQUEST": "10002", + "RIC_X2_RESOURCE_STATUS_RESPONSE": "10003", + "RIC_X2_LOAD_INFORMATION": "10004", + "RIC_E2_TERMINATION_HC_REQUEST": "10005", + "RIC_E2_TERMINATION_HC_RESPONSE": "10006", + "RIC_E2_MANAGER_HC_REQUEST": "10007", + "RIC_E2_MANAGER_HC_RESPONSE": "10008", + "RIC_ENB_LOAD_INFORMATION": "10020", + "RIC_ERROR_INDICATION": "10030", + "RIC_X2_SETUP_REQ": "10060", + "RIC_X2_SETUP_RESP": "10061", + "RIC_X2_SETUP_FAILURE": "10062", + "RIC_X2_RESET_REQ": "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_RESOURCE_STATUS_UPDATE": "10100", + "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_GNB_STATUS_INDICATION": "10450", + "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", + "RIC_CONTROL_REQ": "12040", + "RIC_CONTROL_ACK": "12041", + "RIC_CONTROL_FAILURE": "12042", + "RIC_INDICATION": "12050", + "DC_ADM_INT_CONTROL": "20000", + "DC_ADM_INT_CONTROL_ACK": "20001", "RIC_CONTROL_XAPP_CONFIG_REQUEST": "100000", "RIC_CONTROL_XAPP_CONFIG_RESPONSE": "100001", - - "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_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", - - "RIC_CONTROL_REQ": "12040", - "RIC_CONTROL_ACK": "12041", - "RIC_CONTROL_FAILURE": "12042", - "RIC_INDICATION": "12050", - "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_RES_STATUS_REQ": "10090", - "RIC_RES_STATUS_RESP": "10091", - "RIC_RES_STATUS_FAILURE": "10092", - "RIC_ENB_CONF_UPDATE": "10080", - "RIC_ENB_CONF_UPDATE_ACK": "10081", - "RIC_ENB_CONF_UPDATE_FAILURE": "10082", - "RIC_ENB_LOAD_INFORMATION": "10020", - "RIC_GNB_STATUS_INDICATION": "10450", - "RIC_RESOURCE_STATUS_UPDATE": "10100", - "RIC_ERROR_INDICATION": "10030", - "DC_ADM_INT_CONTROL": "20000", - "DC_ADM_INT_CONTROL_ACK": "20001", } // Messagetype mappings for the platform components.