[RIC-587] Upgrade Release Version to 5.4.1

[ric-plt/e2mgr.git] / E2Manager / managers / e2t_keep_alive_worker_test.go

diff --git a/E2Manager/managers/e2t_keep_alive_worker_test.go b/E2Manager/managers/e2t_keep_alive_worker_test.go
index d6a2fb0..c15aedb 100644 (file)
--- 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) {
@@ -59,14 +60,15 @@ 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)
+       var msgSrc unsafe.Pointer
+       req := rmrCgo.NewMBuf(rmrCgo.E2_TERM_KEEP_ALIVE_REQ, 0, "", &payload, &xAction, msgSrc)
 
-       rmrMessengerMock.AssertCalled(t, "SendMsg", req, true)
+       rmrMessengerMock.AssertCalled(t, "SendMsg", req, false)
 }
 
 func TestShutdownExpiredE2T_InternalError(t *testing.T) {
@@ -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,21 +184,22 @@ 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)
        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()
 
        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, true)
+       rmrMessengerMock.AssertCalled(t, "SendMsg", req, false)
        e2tShutdownManagerMock.AssertCalled(t, "Shutdown", e2tInstance1)
 }
\ No newline at end of file