From: subhash kumar singh Date: Wed, 11 May 2022 18:42:38 +0000 (+0000) Subject: Enable rmrMsgHandler for RICE2nodeConfigUpdate msg X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1925b13b2d817e32516096348a37318bd859a747;p=ric-plt%2Fe2mgr.git Enable rmrMsgHandler for RICE2nodeConfigUpdate msg This patch contains: * Change in lib-rmr dependency to 4.8.3 . * Messange handler enabled to handle RICE2nodeConfigUpdate. Signed-off-by: subhash kumar singh Change-Id: Ib462390829d8ebac7cdbfc99515e4179b3bd4023 --- diff --git a/E2Manager/build-e2mgr-ubuntu.sh b/E2Manager/build-e2mgr-ubuntu.sh index e584005..13059d9 100755 --- a/E2Manager/build-e2mgr-ubuntu.sh +++ b/E2Manager/build-e2mgr-ubuntu.sh @@ -31,11 +31,11 @@ set -eux echo "--> e2mgr-build-ubuntu.sh" # Install RMR from deb packages at packagecloud.io -rmr=rmr_4.8.0_amd64.deb +rmr=rmr_4.8.3_amd64.deb wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/$rmr/download.deb sudo dpkg -i $rmr rm $rmr -rmrdev=rmr-dev_4.8.0_amd64.deb +rmrdev=rmr-dev_4.8.3_amd64.deb wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/$rmrdev/download.deb sudo dpkg -i $rmrdev rm $rmrdev diff --git a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider.go b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider.go index 463b230..5f02168 100644 --- a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider.go +++ b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider.go @@ -94,6 +94,7 @@ func (provider *NotificationHandlerProvider) Init(logger *logger.Logger, config e2TKeepAliveResponseHandler := rmrmsghandlers.NewE2TKeepAliveResponseHandler(logger, rnibDataService, e2tInstancesManager) e2SetupRequestNotificationHandler := rmrmsghandlers.NewE2SetupRequestNotificationHandler(logger, config, e2tInstancesManager, rmrSender, rnibDataService, e2tAssociationManager, ranConnectStatusChangeManager, ranListManager) ricServiceUpdateHandler := rmrmsghandlers.NewRicServiceUpdateHandler(logger, rmrSender, rnibDataService, ranListManager) + ricE2nodeConfigUpdateHandler := rmrmsghandlers.NewE2nodeConfigUpdateNotificationHandler(logger, rnibDataService, rmrSender) provider.Register(rmrCgo.RIC_X2_SETUP_RESP, x2SetupResponseHandler) provider.Register(rmrCgo.RIC_X2_SETUP_FAILURE, x2SetupFailureResponseHandler) @@ -109,4 +110,5 @@ func (provider *NotificationHandlerProvider) Init(logger *logger.Logger, config provider.Register(rmrCgo.E2_TERM_KEEP_ALIVE_RESP, e2TKeepAliveResponseHandler) provider.Register(rmrCgo.RIC_E2_SETUP_REQ, e2SetupRequestNotificationHandler) provider.Register(rmrCgo.RIC_SERVICE_UPDATE, ricServiceUpdateHandler) + provider.Register(rmrCgo.RIC_E2NODE_CONFIG_UPDATE, ricE2nodeConfigUpdateHandler) } diff --git a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go index 28bff54..2e3d364 100644 --- a/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go +++ b/E2Manager/providers/rmrmsghandlerprovider/notification_handler_provider_test.go @@ -98,6 +98,7 @@ func TestGetNotificationHandlerSuccess(t *testing.T) { {rmrCgo.RIC_X2_RESET_RESP, rmrmsghandlers.NewX2ResetResponseHandler(logger, rnibDataService, ranStatusChangeManager, converters.NewX2ResetResponseExtractor(logger))}, {rmrCgo.RIC_X2_RESET, rmrmsghandlers.NewX2ResetRequestNotificationHandler(logger, rnibDataService, ranStatusChangeManager, rmrSender)}, {rmrCgo.RIC_SERVICE_UPDATE, rmrmsghandlers.NewRicServiceUpdateHandler(logger, rmrSender, rnibDataService, ranListManager)}, + {rmrCgo.RIC_E2NODE_CONFIG_UPDATE, rmrmsghandlers.NewE2nodeConfigUpdateNotificationHandler(logger, rnibDataService, rmrSender)}, } for _, tc := range testCases { diff --git a/E2Manager/rmrCgo/rmrCgoTypes.go b/E2Manager/rmrCgo/rmrCgoTypes.go index d3886b4..0cab4da 100644 --- a/E2Manager/rmrCgo/rmrCgoTypes.go +++ b/E2Manager/rmrCgo/rmrCgoTypes.go @@ -18,7 +18,6 @@ // This source code is part of the near-RT RIC (RAN Intelligent Controller) // platform project (RICP). - package rmrCgo // #cgo LDFLAGS: -L/usr/local/lib -lrmr_si @@ -72,25 +71,28 @@ const ( RIC_SCTP_CLEAR_ALL = C.RIC_SCTP_CLEAR_ALL RIC_X2_RESET_RESP = C.RIC_X2_RESET_RESP RIC_X2_RESET = C.RIC_X2_RESET - RIC_E2_TERM_INIT = C.E2_TERM_INIT - RAN_CONNECTED = C.RAN_CONNECTED - RAN_RESTARTED = C.RAN_RESTARTED - RAN_RECONFIGURED = C.RAN_RECONFIGURED - E2_TERM_KEEP_ALIVE_REQ = C.E2_TERM_KEEP_ALIVE_REQ - E2_TERM_KEEP_ALIVE_RESP = C.E2_TERM_KEEP_ALIVE_RESP - RIC_E2_SETUP_REQ = C.RIC_E2_SETUP_REQ + RIC_E2_TERM_INIT = C.E2_TERM_INIT + RAN_CONNECTED = C.RAN_CONNECTED + RAN_RESTARTED = C.RAN_RESTARTED + RAN_RECONFIGURED = C.RAN_RECONFIGURED + E2_TERM_KEEP_ALIVE_REQ = C.E2_TERM_KEEP_ALIVE_REQ + E2_TERM_KEEP_ALIVE_RESP = C.E2_TERM_KEEP_ALIVE_RESP + RIC_E2_SETUP_REQ = C.RIC_E2_SETUP_REQ RIC_E2_SETUP_RESP = C.RIC_E2_SETUP_RESP RIC_E2_SETUP_FAILURE = C.RIC_E2_SETUP_FAILURE RIC_SERVICE_QUERY = C.RIC_SERVICE_QUERY RIC_SERVICE_UPDATE = C.RIC_SERVICE_UPDATE RIC_SERVICE_UPDATE_ACK = C.RIC_SERVICE_UPDATE_ACK RIC_SERVICE_UPDATE_FAILURE = C.RIC_SERVICE_UPDATE_FAILURE + RIC_E2NODE_CONFIG_UPDATE = C.RIC_E2NODE_CONFIG_UPDATE + RIC_E2NODE_CONFIG_UPDATE_ACK = C.RIC_E2NODE_CONFIG_UPDATE_ACK + RIC_E2NODE_CONFIG_UPDATE_FAILURE = C.RIC_E2NODE_CONFIG_UPDATE_FAILURE ) const ( RMR_MAX_XACTION_LEN = int(C.RMR_MAX_XID) RMR_MAX_MEID_LEN = int(C.RMR_MAX_MEID) - RMR_MAX_SRC_LEN = int(C.RMR_MAX_SRC) + RMR_MAX_SRC_LEN = int(C.RMR_MAX_SRC) //states RMR_OK = C.RMR_OK