From: idanshal Date: Wed, 25 Mar 2020 09:47:50 +0000 (+0200) Subject: Remove logs for KA requests X-Git-Tag: R5_RC~116 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F2965%2F1;p=ric-plt%2Fe2mgr.git Remove logs for KA requests Change-Id: I4f9d4903f3ed462626c6558706c5aed01973d052 Signed-off-by: idanshal --- diff --git a/E2Manager/managers/e2t_keep_alive_worker.go b/E2Manager/managers/e2t_keep_alive_worker.go index a9c9f2f..606e339 100644 --- a/E2Manager/managers/e2t_keep_alive_worker.go +++ b/E2Manager/managers/e2t_keep_alive_worker.go @@ -53,7 +53,7 @@ func (h E2TKeepAliveWorker) Execute() { ticker := time.NewTicker(time.Duration(h.config.KeepAliveDelayMs) * time.Millisecond) - for _= range ticker.C { + for _ = range ticker.C { h.SendKeepAliveRequest() h.E2TKeepAliveExpired() @@ -84,6 +84,6 @@ func (h E2TKeepAliveWorker) E2TKeepAliveExpired() { func (h E2TKeepAliveWorker) SendKeepAliveRequest() { - request := models.RmrMessage{MsgType: rmrCgo.E2_TERM_KEEP_ALIVE_REQ} - h.rmrSender.Send(&request) -} \ No newline at end of file + rmrMessage := models.RmrMessage{MsgType: rmrCgo.E2_TERM_KEEP_ALIVE_REQ} + h.rmrSender.SendWithoutLogs(&rmrMessage) +} diff --git a/E2Manager/managers/e2t_keep_alive_worker_test.go b/E2Manager/managers/e2t_keep_alive_worker_test.go index d6a2fb0..0100f28 100644 --- a/E2Manager/managers/e2t_keep_alive_worker_test.go +++ b/E2Manager/managers/e2t_keep_alive_worker_test.go @@ -59,14 +59,14 @@ func initE2TKeepAliveTest(t *testing.T) (*mocks.RmrMessengerMock, *mocks.RnibRea func TestSendKeepAliveRequest(t *testing.T) { rmrMessengerMock, _, _, _, e2tKeepAliveWorker := initE2TKeepAliveTest(t) - rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, nil) + rmrMessengerMock.On("SendMsg", mock.Anything, false).Return(&rmrCgo.MBuf{}, nil) e2tKeepAliveWorker.SendKeepAliveRequest() var payload, xAction []byte req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction) - rmrMessengerMock.AssertCalled(t, "SendMsg", req, true) + rmrMessengerMock.AssertCalled(t, "SendMsg", req, false) } func TestShutdownExpiredE2T_InternalError(t *testing.T) { @@ -188,7 +188,7 @@ func TestExecute_Two_E2TExpired(t *testing.T) { readerMock.On("GetE2TAddresses").Return(addresses, nil) readerMock.On("GetE2TInstances",addresses).Return([]*entities.E2TInstance{e2tInstance1}, nil) e2tShutdownManagerMock.On("Shutdown", e2tInstance1).Return(nil) - rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(&rmrCgo.MBuf{}, nil) + rmrMessengerMock.On("SendMsg", mock.Anything, false).Return(&rmrCgo.MBuf{}, nil) go e2tKeepAliveWorker.Execute() @@ -197,6 +197,6 @@ func TestExecute_Two_E2TExpired(t *testing.T) { var payload, xAction []byte req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction) - rmrMessengerMock.AssertCalled(t, "SendMsg", req, true) + rmrMessengerMock.AssertCalled(t, "SendMsg", req, false) e2tShutdownManagerMock.AssertCalled(t, "Shutdown", e2tInstance1) } \ No newline at end of file