X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2FrNibWriter%2FrNibWriter_test.go;h=92a0918cef6728722376a20816b7501474ab22e4;hb=refs%2Fchanges%2F32%2F732%2F1;hp=97535cc546e73c783b286943c4669df5d33b6b62;hpb=07ef76dd471a0892a893c90e0ab06713aee34be1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/rNibWriter/rNibWriter_test.go b/E2Manager/rNibWriter/rNibWriter_test.go
index 97535cc..92a0918 100644
--- a/E2Manager/rNibWriter/rNibWriter_test.go
+++ b/E2Manager/rNibWriter/rNibWriter_test.go
@@ -18,13 +18,12 @@
 package rNibWriter
 
 import (
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"e2mgr/mocks"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"errors"
 	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
@@ -105,12 +104,20 @@ func TestSaveEnb(t *testing.T) {
 	setExpected = append(setExpected, fmt.Sprintf("PCI:%s:%02x", name, cell.GetPci()), cellData)
 
 	sdlInstanceMock.On("Set", []interface{}{setExpected}).Return(e)
+
+	nbIdData, err := proto.Marshal(&entities.NbIdentity{InventoryName: name})
+	if err != nil {
+		t.Errorf("#rNibWriter_test.TestSaveEnb - Failed to marshal nbIdentity entity. Error: %v", err)
+	}
+	sdlInstanceMock.On("RemoveMember", entities.Node_UNKNOWN.String(), []interface{}{nbIdData}).Return(e)
+
 	nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:"02f829", NbId:"4a952a0a"}}
-	nbIdData, err := proto.Marshal(nbIdentity)
+	nbIdData, err = proto.Marshal(nbIdentity)
 	if err != nil {
 		t.Errorf("#rNibWriter_test.TestSaveEnb - Failed to marshal NodeB Identity entity. Error: %v", err)
 	}
 	sdlInstanceMock.On("AddMember", "ENB", []interface{}{nbIdData}).Return(e)
+
 	rNibErr := w.SaveNodeb(nbIdentity, &nb)
 	assert.Nil(t, rNibErr)
 }
@@ -247,6 +254,12 @@ func TestSaveGnb(t *testing.T) {
 	}
 	sdlInstanceMock.On("AddMember", "GNB", []interface{}{nbIdData}).Return(e)
 
+	nbIdData, err = proto.Marshal(&entities.NbIdentity{InventoryName: name})
+	if err != nil {
+		t.Errorf("#rNibWriter_test.TestSaveEnb - Failed to marshal nbIdentity entity. Error: %v", err)
+	}
+	sdlInstanceMock.On("RemoveMember", entities.Node_UNKNOWN.String(), []interface{}{nbIdData}).Return(e)
+
 	rNibErr := w.SaveNodeb(nbIdentity, &nb)
 	assert.Nil(t, rNibErr)
 }
@@ -361,7 +374,7 @@ func generateCellLoadInformation() *entities.CellLoadInformation {
 		EnhancedRntp: &entities.EnhancedRntp{
 			EnhancedRntpBitmap:"xxx",
 			RntpHighPowerThreshold:entities.RntpThreshold_NEG_2,
-			EnhancedRntpStartTimes: []*entities.StartTime{&entities.StartTime{StartSfn:500,StartSubframeNumber:5}},
+			EnhancedRntpStartTime: &entities.StartTime{StartSfn:500,StartSubframeNumber:5},
 		},
 	}
 
@@ -386,7 +399,7 @@ func generateCellLoadInformation() *entities.CellLoadInformation {
 
 	cellLoadInformation.CompInformation = &entities.CompInformation{
 		CompInformationItems:[]*entities.CompInformationItem{compInformationItem},
-		CompInformationStartTime:[]*entities.StartTime{&entities.StartTime{StartSfn:123,StartSubframeNumber:456}},
+		CompInformationStartTime:&entities.StartTime{StartSfn:123,StartSubframeNumber:456},
 	}
 
 	cellLoadInformation.DynamicDlTransmissionInformation = &entities.DynamicDlTransmissionInformation{
@@ -402,7 +415,7 @@ func generateCellLoadInformation() *entities.CellLoadInformation {
 func generateRanLoadInformation() *entities.RanLoadInformation {
 	ranLoadInformation := entities.RanLoadInformation{}
 
-	ranLoadInformation.LoadTimestamp = &timestamp.Timestamp{Seconds:time.Now().Unix(),Nanos: int32(time.Now().UnixNano())}
+	ranLoadInformation.LoadTimestamp = uint64(time.Now().UnixNano())
 
 
 	cellLoadInformation := generateCellLoadInformation()
@@ -534,7 +547,7 @@ func TestInit(t *testing.T) {
 
 //Integration tests
 //
-//func TestSaveEnbInteg(t *testing.T){
+//func TestSaveEnbGnbInteg(t *testing.T){
 //	for i := 0; i<10; i++{
 //		Init("e2Manager", 1)
 //		w := GetRNibWriter()
@@ -559,7 +572,7 @@ func TestInit(t *testing.T) {
 //
 //		nb1 := entities.NodebInfo{}
 //		nb1.NodeType = entities.Node_GNB
-//		nb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+//		nb1.ConnectionStatus = entities.ConnectionStatus_CONNECTED
 //		nb1.Ip = "localhost"
 //		nb1.Port =  uint32(6565 + i)
 //		gnb := entities.Gnb{}
@@ -575,7 +588,23 @@ func TestInit(t *testing.T) {
 //		}
 //	}
 //}
-
+//
+//func TestSaveNbRanNamesInteg(t *testing.T){
+//	for i := 0; i<10; i++{
+//		Init("e2Manager", 1)
+//		w := GetRNibWriter()
+//		nb := entities.NodebInfo{}
+//		nb.ConnectionStatus = entities.ConnectionStatus_CONNECTING
+//		nb.Ip = "localhost"
+//		nb.Port = uint32(5656 + i)
+//		nbIdentity := &entities.NbIdentity{InventoryName: fmt.Sprintf("nameOnly%d" ,i)}
+//		err := w.SaveNodeb(nbIdentity, &nb)
+//		if err != nil{
+//			t.Errorf("#rNibWriter_test.TestSaveEnbInteg - Failed to save NodeB entity. Error: %v", err)
+//		}
+//	}
+//}
+//
 //func TestSaveRanLoadInformationInteg(t *testing.T){
 //		Init("e2Manager", 1)
 //		w := GetRNibWriter()