X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_keep_alive_worker_test.go;h=c15aedbb3b9880075b6ba4c696575b314cb87a8e;hb=9b5156ceeeca10c0039016761182f31aeaf2b39c;hp=0100f285d1ac6257c3be722b9bdb6052466e8d7a;hpb=e611aee31f24b6944597fa3725a23b762716f305;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_keep_alive_worker_test.go b/E2Manager/managers/e2t_keep_alive_worker_test.go index 0100f28..c15aedb 100644 --- a/E2Manager/managers/e2t_keep_alive_worker_test.go +++ b/E2Manager/managers/e2t_keep_alive_worker_test.go @@ -32,6 +32,7 @@ import ( "github.com/stretchr/testify/mock" "testing" "time" + "unsafe" ) func initE2TKeepAliveTest(t *testing.T) (*mocks.RmrMessengerMock, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TShutdownManagerMock, *E2TKeepAliveWorker) { @@ -64,7 +65,8 @@ func TestSendKeepAliveRequest(t *testing.T) { e2tKeepAliveWorker.SendKeepAliveRequest() var payload, xAction []byte - req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction) + var msgSrc unsafe.Pointer + req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction, msgSrc) rmrMessengerMock.AssertCalled(t, "SendMsg", req, false) } @@ -95,9 +97,9 @@ func TestShutdownExpiredE2T_NotExpired_InternalError(t *testing.T) { rmrMessengerMock, readerMock, _, _, e2tKeepAliveWorker := initE2TKeepAliveTest(t) addresses := []string{E2TAddress,E2TAddress2} - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.AssociatedRanList = []string{"test4","test5","test6", "test7"} readerMock.On("GetE2TAddresses").Return(addresses, nil) @@ -122,9 +124,9 @@ func TestShutdownExpiredE2T_NotExpired(t *testing.T) { rmrMessengerMock, readerMock, _, _, e2tKeepAliveWorker := initE2TKeepAliveTest(t) addresses := []string{E2TAddress,E2TAddress2} - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.AssociatedRanList = []string{"test4","test5","test6", "test7"} readerMock.On("GetE2TAddresses").Return(addresses, nil) @@ -139,12 +141,12 @@ func TestShutdownExpiredE2T_One_E2TExpired(t *testing.T) { _, readerMock, _, e2tShutdownManagerMock, e2tKeepAliveWorker := initE2TKeepAliveTest(t) addresses := []string{E2TAddress,E2TAddress2} - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"} time.Sleep(time.Duration(400) * time.Millisecond) - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.AssociatedRanList = []string{"test4","test5","test6", "test7"} readerMock.On("GetE2TAddresses").Return(addresses, nil) @@ -160,10 +162,10 @@ func TestShutdownExpiredE2T_Two_E2TExpired(t *testing.T) { _, readerMock, _, e2tShutdownManagerMock, e2tKeepAliveWorker := initE2TKeepAliveTest(t) addresses := []string{E2TAddress,E2TAddress2} - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"} - e2tInstance2 := entities.NewE2TInstance(E2TAddress2) + e2tInstance2 := entities.NewE2TInstance(E2TAddress2, PodName) e2tInstance2.AssociatedRanList = []string{"test4","test5","test6", "test7"} time.Sleep(time.Duration(400) * time.Millisecond) @@ -182,7 +184,7 @@ func TestExecute_Two_E2TExpired(t *testing.T) { rmrMessengerMock, readerMock, _, e2tShutdownManagerMock, e2tKeepAliveWorker := initE2TKeepAliveTest(t) addresses := []string{E2TAddress,E2TAddress2} - e2tInstance1 := entities.NewE2TInstance(E2TAddress) + e2tInstance1 := entities.NewE2TInstance(E2TAddress, PodName) e2tInstance1.AssociatedRanList = []string{"test1","test2","test3"} readerMock.On("GetE2TAddresses").Return(addresses, nil) @@ -195,7 +197,8 @@ func TestExecute_Two_E2TExpired(t *testing.T) { time.Sleep(time.Duration(500) * time.Millisecond) var payload, xAction []byte - req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction) + var msgSrc unsafe.Pointer + req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction, msgSrc) rmrMessengerMock.AssertCalled(t, "SendMsg", req, false) e2tShutdownManagerMock.AssertCalled(t, "Shutdown", e2tInstance1)