X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_keep_alive_worker_test.go;h=bd775728252010b8fe2b10d4d81042230b2030d1;hb=refs%2Fchanges%2F66%2F12566%2F1;hp=d6a2fb0089551f664ce112a7a36dfc30a9543cb6;hpb=8606e3f5d9501605424efb330854e584d22a2151;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 d6a2fb0..bd77572 100644
--- a/E2Manager/managers/e2t_keep_alive_worker_test.go
+++ b/E2Manager/managers/e2t_keep_alive_worker_test.go
@@ -32,10 +32,12 @@ import (
 	"github.com/stretchr/testify/mock"
 	"testing"
 	"time"
+	"unsafe"
 )
 
 func initE2TKeepAliveTest(t *testing.T) (*mocks.RmrMessengerMock, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.E2TShutdownManagerMock, *E2TKeepAliveWorker) {
-	logger, err := logger.InitLogger(logger.DebugLevel)
+	DebugLevel := int8(4)
+	logger, err := logger.InitLogger(DebugLevel)
 	if err != nil {
 		t.Errorf("#... - failed to initialize logger, error: %s", err)
 	}
@@ -59,14 +61,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 +98,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 +125,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 +142,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 +163,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 +185,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
+}