Preparation for SdlInstance usage removal in RNIB

[ric-plt/nodeb-rnib.git] / reader / rNibReader_test.go

diff --git a/reader/rNibReader_test.go b/reader/rNibReader_test.go
index 4004be5..dea8970 100644 (file)
--- a/reader/rNibReader_test.go
+++ b/reader/rNibReader_test.go
@@ -31,15 +31,20 @@ import (
        "time"
 )
 
-func initSdlInstanceMock() (w RNibReader, sdlInstanceMock *MockSdlInstance) {
-       sdlInstanceMock = new(MockSdlInstance)
-       w = GetRNibReader(sdlInstanceMock)
+func initSdlSyncStorageMock() (w RNibReader, sdlStorageMock *MockSdlSyncStorage) {
+       sdlStorageMock = new(MockSdlSyncStorage)
+       w = GetNewRNibReader(sdlStorageMock)
        return
 }
 
+func TestGetRNibNamespace(t *testing.T) {
+       ns := common.GetRNibNamespace()
+       assert.Equal(t, "e2Manager", ns)
+}
+
 func TestGetNodeB(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -58,7 +63,7 @@ func TestGetNodeB(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeB - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetNodeb(name)
        assert.Nil(t, er)
        assert.Equal(t, getNb.Ip, nb.Ip)
@@ -70,14 +75,14 @@ func TestGetNodeB(t *testing.T) {
 
 func TestGetNodeBNotFoundFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetNodeBNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetNodeb(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -87,7 +92,7 @@ func TestGetNodeBNotFoundFailure(t *testing.T) {
 
 func TestGetNodeBUnmarshalFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        ret := make(map[string]interface{}, 1)
        redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
@@ -95,7 +100,7 @@ func TestGetNodeBUnmarshalFailure(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBUnmarshalFailure - failed to validate key parameter")
        }
        ret[redisKey] = "data"
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetNodeb(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -107,14 +112,14 @@ func TestGetNodeBSdlgoFailure(t *testing.T) {
        name := "name"
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var ret map[string]interface{}
        redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetNodeBSdlgoFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetNodeb(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -124,7 +129,7 @@ func TestGetNodeBSdlgoFailure(t *testing.T) {
 
 func TestGetNodeBCellsListEnb(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -143,7 +148,7 @@ func TestGetNodeBCellsListEnb(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListEnb - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        cells, er := w.GetCellList(name)
        assert.Nil(t, er)
        assert.NotNil(t, cells)
@@ -154,7 +159,7 @@ func TestGetNodeBCellsListEnb(t *testing.T) {
 
 func TestGetNodeBCellsListGnb(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -174,7 +179,7 @@ func TestGetNodeBCellsListGnb(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListGnb - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        cells, er := w.GetCellList(name)
        assert.Nil(t, er)
        assert.NotNil(t, cells)
@@ -185,7 +190,7 @@ func TestGetNodeBCellsListGnb(t *testing.T) {
 
 func TestGetNodeBCellsListNodeUnmarshalFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        ret := make(map[string]interface{}, 1)
        redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
@@ -193,7 +198,7 @@ func TestGetNodeBCellsListNodeUnmarshalFailure(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListNodeUnmarshalFailure - failed to validate key parameter")
        }
        ret[redisKey] = "data"
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        cells, er := w.GetCellList(name)
        assert.NotNil(t, er)
        assert.Nil(t, cells)
@@ -203,14 +208,14 @@ func TestGetNodeBCellsListNodeUnmarshalFailure(t *testing.T) {
 
 func TestGetNodeBCellsListNodeNotFoundFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListNodeNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        cells, er := w.GetCellList(name)
        assert.NotNil(t, er)
        assert.Nil(t, cells)
@@ -220,7 +225,7 @@ func TestGetNodeBCellsListNodeNotFoundFailure(t *testing.T) {
 
 func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -237,7 +242,7 @@ func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListNotFoundFailureEnb - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        _, er := w.GetCellList(name)
        assert.NotNil(t, er)
        assert.EqualValues(t, "#rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
@@ -245,7 +250,7 @@ func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) {
 
 func TestGetNodeBCellsListNotFoundFailureGnb(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -262,16 +267,16 @@ func TestGetNodeBCellsListNotFoundFailureGnb(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetNodeBCellsListNotFoundFailureGnb - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        _, er := w.GetCellList(name)
        assert.NotNil(t, er)
        assert.EqualValues(t, "#rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
 }
 
 func TestGetListGnbIdsUnmarshalFailure(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{"data"}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return([]string{"data"}, e)
        ids, er := w.GetListGnbIds()
        assert.NotNil(t, er)
        assert.Nil(t, ids)
@@ -282,10 +287,10 @@ func TestGetListGnbIdsUnmarshalFailure(t *testing.T) {
 func TestGetListGnbIdsSdlgoFailure(t *testing.T) {
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var data []string
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(data, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(data, e)
        ids, er := w.GetListGnbIds()
        assert.NotNil(t, er)
        assert.Nil(t, ids)
@@ -294,7 +299,7 @@ func TestGetListGnbIdsSdlgoFailure(t *testing.T) {
 }
 
 func TestGetListNodesIdsGnbSdlgoFailure(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        name := "name"
        plmnId := "02f829"
@@ -305,13 +310,13 @@ func TestGetListNodesIdsGnbSdlgoFailure(t *testing.T) {
        if err != nil {
                t.Errorf("#rNibReader_test.TestGetListNodesIdsGnbSdlgoFailure - Failed to marshal nodeb identity entity. Error: %v", err)
        }
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{string(data)}, nilError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return([]string{string(data)}, nilError)
 
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
        expectedError := errors.New(errMsg)
        var nilData []string
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(nilData, expectedError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(nilData, expectedError)
 
        ids, er := w.GetListNodebIds()
        assert.NotNil(t, er)
@@ -321,7 +326,7 @@ func TestGetListNodesIdsGnbSdlgoFailure(t *testing.T) {
 }
 
 func TestGetListNodesIdsEnbSdlgoFailure(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        name := "name"
        plmnId := "02f829"
@@ -332,13 +337,13 @@ func TestGetListNodesIdsEnbSdlgoFailure(t *testing.T) {
        if err != nil {
                t.Errorf("#rNibReader_test.TestGetListNodesIdsEnbSdlgoFailure - Failed to marshal nodeb identity entity. Error: %v", err)
        }
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{string(data)}, nilError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return([]string{string(data)}, nilError)
 
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
        expectedError := errors.New(errMsg)
        var nilData []string
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(nilData, expectedError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return(nilData, expectedError)
 
        ids, er := w.GetListNodebIds()
        assert.NotNil(t, er)
@@ -348,7 +353,7 @@ func TestGetListNodesIdsEnbSdlgoFailure(t *testing.T) {
 }
 
 func TestGetListNodesIdsSuccess(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var nilError error
 
        name := "name"
@@ -369,8 +374,8 @@ func TestGetListNodesIdsSuccess(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetListNodesIdsSuccess - Failed to marshal nodeb identity entity. Error: %v", err)
        }
 
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{string(data)}, nilError)
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{string(data1)}, nilError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return([]string{string(data)}, nilError)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return([]string{string(data1)}, nilError)
 
        ids, er := w.GetListNodebIds()
        assert.Nil(t, er)
@@ -379,9 +384,9 @@ func TestGetListNodesIdsSuccess(t *testing.T) {
 }
 
 func TestGetListEnbIdsUnmarshalFailure(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{"data"}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return([]string{"data"}, e)
        ids, er := w.GetListEnbIds()
        assert.NotNil(t, er)
        assert.Nil(t, ids)
@@ -393,14 +398,14 @@ func TestGetListEnbIdsOneId(t *testing.T) {
        name := "name"
        plmnId := "02f829"
        nbId := "4a952a0a"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}}
        var e error
        data, err := proto.Marshal(nbIdentity)
        if err != nil {
                t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
        }
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{string(data)}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return([]string{string(data)}, e)
        ids, er := w.GetListEnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, 1)
@@ -410,9 +415,9 @@ func TestGetListEnbIdsOneId(t *testing.T) {
 }
 
 func TestGetListEnbIdsNoIds(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return([]string{}, e)
        ids, er := w.GetListEnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, 0)
@@ -423,7 +428,7 @@ func TestGetListEnbIds(t *testing.T) {
        plmnId := 0x02f829
        nbId := 0x4a952a0a
        listSize := 3
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        idsData := make([]string, listSize)
        idsEntities := make([]*entities.NbIdentity, listSize)
        for i := 0; i < listSize; i++ {
@@ -436,7 +441,7 @@ func TestGetListEnbIds(t *testing.T) {
                idsEntities[i] = nbIdentity
        }
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(idsData, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return(idsData, e)
        ids, er := w.GetListEnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, listSize)
@@ -451,14 +456,14 @@ func TestGetListGnbIdsOneId(t *testing.T) {
        name := "name"
        plmnId := "02f829"
        nbId := "4a952a0a"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}}
        var e error
        data, err := proto.Marshal(nbIdentity)
        if err != nil {
                t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err)
        }
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{string(data)}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return([]string{string(data)}, e)
        ids, er := w.GetListGnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, 1)
@@ -468,9 +473,9 @@ func TestGetListGnbIdsOneId(t *testing.T) {
 }
 
 func TestGetListGnbIdsNoIds(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{}, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return([]string{}, e)
        ids, er := w.GetListGnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, 0)
@@ -481,7 +486,7 @@ func TestGetListGnbIds(t *testing.T) {
        plmnId := 0x02f829
        nbId := 0x4a952a0a
        listSize := 3
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        idsData := make([]string, listSize)
        idsEntities := make([]*entities.NbIdentity, listSize)
        for i := 0; i < listSize; i++ {
@@ -494,7 +499,7 @@ func TestGetListGnbIds(t *testing.T) {
                idsEntities[i] = nbIdentity
        }
        var e error
-       sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(idsData, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(idsData, e)
        ids, er := w.GetListGnbIds()
        assert.Nil(t, er)
        assert.Len(t, ids, listSize)
@@ -508,10 +513,10 @@ func TestGetListGnbIds(t *testing.T) {
 func TestGetListEnbIdsSdlgoFailure(t *testing.T) {
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var data []string
-       sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(data, e)
+       sdlInstanceMock.On("GetMembers", common.GetRNibNamespace(), entities.Node_ENB.String()).Return(data, e)
        ids, er := w.GetListEnbIds()
        assert.NotNil(t, er)
        assert.Nil(t, ids)
@@ -520,18 +525,18 @@ func TestGetListEnbIdsSdlgoFailure(t *testing.T) {
 }
 
 func TestGetCountGnbListOneId(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(1, e)
+       sdlInstanceMock.On("GroupSize", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(1, e)
        count, er := w.GetCountGnbList()
        assert.Nil(t, er)
        assert.Equal(t, count, 1)
 }
 
 func TestGetCountGnbList(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
-       sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(3, e)
+       sdlInstanceMock.On("GroupSize", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(3, e)
        count, er := w.GetCountGnbList()
        assert.Nil(t, er)
        assert.Equal(t, count, 3)
@@ -540,10 +545,10 @@ func TestGetCountGnbList(t *testing.T) {
 func TestGetCountGnbListSdlgoFailure(t *testing.T) {
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var count int
-       sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(count, e)
+       sdlInstanceMock.On("GroupSize", common.GetRNibNamespace(), entities.Node_GNB.String()).Return(count, e)
        count, er := w.GetCountGnbList()
        assert.NotNil(t, er)
        assert.Equal(t, 0, count)
@@ -554,7 +559,7 @@ func TestGetCountGnbListSdlgoFailure(t *testing.T) {
 func TestGetCell(t *testing.T) {
        name := "name"
        var pci uint32 = 10
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: &entities.ServedCellInfo{Pci: pci}}}
        cellData, err := proto.Marshal(&cellEntity)
        if err != nil {
@@ -566,7 +571,7 @@ func TestGetCell(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetCell - failed to validate key parameter")
        }
        ret := map[string]interface{}{key: string(cellData)}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCell(name, pci)
        assert.Nil(t, er)
        assert.NotNil(t, cell)
@@ -578,14 +583,14 @@ func TestGetCell(t *testing.T) {
 func TestGetCellNotFoundFailure(t *testing.T) {
        name := "name"
        var pci uint32
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetCellNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCell(name, pci)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -596,7 +601,7 @@ func TestGetCellNotFoundFailure(t *testing.T) {
 func TestGetCellUnmarshalFailure(t *testing.T) {
        name := "name"
        var pci uint32
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        ret := make(map[string]interface{}, 1)
        key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
@@ -604,7 +609,7 @@ func TestGetCellUnmarshalFailure(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetCellUnmarshalFailure - failed to validate key parameter")
        }
        ret[key] = "data"
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCell(name, pci)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -617,14 +622,14 @@ func TestGetCellSdlgoFailure(t *testing.T) {
        var pci uint32
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var ret map[string]interface{}
        key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetCellSdlgoFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCell(name, pci)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -633,7 +638,7 @@ func TestGetCellSdlgoFailure(t *testing.T) {
 }
 
 func TestGetNodebById(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        nb := entities.NodebInfo{NodeType: entities.Node_ENB}
        nb.ConnectionStatus = 1
        nb.Ip = "localhost"
@@ -655,7 +660,7 @@ func TestGetNodebById(t *testing.T) {
                t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
        }
        ret := map[string]interface{}{key: string(data)}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}
        getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId)
        assert.Nil(t, er)
@@ -669,14 +674,14 @@ func TestGetNodebById(t *testing.T) {
 func TestGetNodebByIdNotFoundFailureEnb(t *testing.T) {
        plmnId := "02f829"
        nbId := "4a952a0a"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId)
        if rNibErr != nil {
                t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
        }
        var ret map[string]interface{}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}
        getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId)
        assert.NotNil(t, er)
@@ -688,14 +693,14 @@ func TestGetNodebByIdNotFoundFailureEnb(t *testing.T) {
 func TestGetNodebByIdNotFoundFailureGnb(t *testing.T) {
        plmnId := "02f829"
        nbId := "4a952a0a"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId)
        if rNibErr != nil {
                t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
        }
        var ret map[string]interface{}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}
        getNb, er := w.GetNodebByGlobalNbId(entities.Node_GNB, globalNbId)
        assert.NotNil(t, er)
@@ -707,7 +712,7 @@ func TestGetNodebByIdNotFoundFailureGnb(t *testing.T) {
 func TestGetNodeByIdUnmarshalFailure(t *testing.T) {
        plmnId := "02f829"
        nbId := "4a952a0a"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId)
        if rNibErr != nil {
                t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
@@ -715,7 +720,7 @@ func TestGetNodeByIdUnmarshalFailure(t *testing.T) {
        var e error
        ret := make(map[string]interface{}, 1)
        ret[key] = "data"
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}
        getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId)
        assert.NotNil(t, er)
@@ -729,14 +734,14 @@ func TestGetNodeByIdSdlgoFailure(t *testing.T) {
        nbId := "4a952a0a"
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId)
        if rNibErr != nil {
                t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
        }
        e := errors.New(errMsg)
        var ret map[string]interface{}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}
        getNb, er := w.GetNodebByGlobalNbId(entities.Node_GNB, globalNbId)
        assert.NotNil(t, er)
@@ -748,7 +753,7 @@ func TestGetNodeByIdSdlgoFailure(t *testing.T) {
 func TestGetCellById(t *testing.T) {
        cellId := "aaaa"
        var pci uint32 = 10
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: &entities.ServedCellInfo{Pci: pci}}}
        cellData, err := proto.Marshal(&cellEntity)
        if err != nil {
@@ -760,7 +765,7 @@ func TestGetCellById(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetCellById - failed to validate key parameter")
        }
        ret := map[string]interface{}{key: string(cellData)}
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId)
        assert.Nil(t, er)
        assert.NotNil(t, cell)
@@ -771,14 +776,14 @@ func TestGetCellById(t *testing.T) {
 
 func TestGetCellByIdNotFoundFailureEnb(t *testing.T) {
        cellId := "bbbb"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        key, rNibErr := common.ValidateAndBuildCellIdKey(cellId)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetCellByIdNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -788,14 +793,14 @@ func TestGetCellByIdNotFoundFailureEnb(t *testing.T) {
 
 func TestGetCellByIdNotFoundFailureGnb(t *testing.T) {
        cellId := "bbbb"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        key, rNibErr := common.ValidateAndBuildNrCellIdKey(cellId)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetCellByIdNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{key}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(ret, e)
        cell, er := w.GetCellById(entities.Cell_NR_CELL, cellId)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -805,7 +810,7 @@ func TestGetCellByIdNotFoundFailureGnb(t *testing.T) {
 
 func TestGetCellByIdTypeValidationFailure(t *testing.T) {
        cellId := "dddd"
-       w, _ := initSdlInstanceMock()
+       w, _ := initSdlSyncStorageMock()
        cell, er := w.GetCellById(5, cellId)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -815,7 +820,7 @@ func TestGetCellByIdTypeValidationFailure(t *testing.T) {
 
 func TestGetCellByIdValidationFailureGnb(t *testing.T) {
        cellId := ""
-       w, _ := initSdlInstanceMock()
+       w, _ := initSdlSyncStorageMock()
        cell, er := w.GetCellById(entities.Cell_NR_CELL, cellId)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -825,7 +830,7 @@ func TestGetCellByIdValidationFailureGnb(t *testing.T) {
 
 func TestGetCellByIdValidationFailureEnb(t *testing.T) {
        cellId := ""
-       w, _ := initSdlInstanceMock()
+       w, _ := initSdlSyncStorageMock()
        cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId)
        assert.NotNil(t, er)
        assert.Nil(t, cell)
@@ -835,7 +840,7 @@ func TestGetCellByIdValidationFailureEnb(t *testing.T) {
 
 func TestGetRanLoadInformation(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        loadInfo := generateRanLoadInformation()
        var e error
        data, err := proto.Marshal(loadInfo)
@@ -847,7 +852,7 @@ func TestGetRanLoadInformation(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetRanLoadInformationNotFoundFailure - failed to validate key parameter")
        }
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getLoadInfo, er := w.GetRanLoadInformation(name)
        assert.Nil(t, er)
        assert.NotNil(t, getLoadInfo)
@@ -864,7 +869,7 @@ func TestGetRanLoadInformation(t *testing.T) {
 
 func TestGetRanLoadInformationValidationFailure(t *testing.T) {
        name := ""
-       w, _ := initSdlInstanceMock()
+       w, _ := initSdlSyncStorageMock()
        getNb, er := w.GetRanLoadInformation(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -874,14 +879,14 @@ func TestGetRanLoadInformationValidationFailure(t *testing.T) {
 
 func TestGetRanLoadInformationNotFoundFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        var ret map[string]interface{}
        redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetRanLoadInformationNotFoundFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetRanLoadInformation(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -891,7 +896,7 @@ func TestGetRanLoadInformationNotFoundFailure(t *testing.T) {
 
 func TestGetRanLoadInformationUnmarshalFailure(t *testing.T) {
        name := "name"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        var e error
        ret := make(map[string]interface{}, 1)
        redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
@@ -899,7 +904,7 @@ func TestGetRanLoadInformationUnmarshalFailure(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetRanLoadInformationUnmarshalFailure - failed to validate key parameter")
        }
        ret[redisKey] = "data"
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetRanLoadInformation(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -911,14 +916,14 @@ func TestGetRanLoadInformationSdlgoFailure(t *testing.T) {
        name := "name"
        errMsg := "expected Sdlgo error"
        errMsgExpected := "expected Sdlgo error"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
        e := errors.New(errMsg)
        var ret map[string]interface{}
        redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
        if rNibErr != nil {
                t.Errorf("#rNibReader_test.TestGetRanLoadInformationSdlgoFailure - failed to validate key parameter")
        }
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
        getNb, er := w.GetRanLoadInformation(name)
        assert.NotNil(t, er)
        assert.Nil(t, getNb)
@@ -1007,7 +1012,7 @@ func TestGetE2TInstanceSuccess(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetE2TInstanceSuccess - Failed to build E2T Instance key. Error: %v", validationErr)
        }
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        e2tInstance := generateE2tInstance(address)
        data, err := json.Marshal(e2tInstance)
@@ -1018,7 +1023,7 @@ func TestGetE2TInstanceSuccess(t *testing.T) {
 
        var e error
        ret := map[string]interface{}{redisKey: string(data)}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, e)
 
        res, rNibErr := w.GetE2TInstance(address)
        assert.Nil(t, rNibErr)
@@ -1037,7 +1042,7 @@ func TestUnmarshal(t *testing.T) {
 }
 
 func TestGetE2TInstanceEmptyAddressFailure(t *testing.T) {
-       w, _ := initSdlInstanceMock()
+       w, _ := initSdlSyncStorageMock()
        res, err := w.GetE2TInstance("")
        assert.NotNil(t, err)
        assert.IsType(t, &common.ValidationError{}, err)
@@ -1052,11 +1057,11 @@ func TestGetE2TInstanceSdlError(t *testing.T) {
                t.Errorf("#rNibReader_test.TestGetE2TInstanceSuccess - Failed to build E2T Instance key. Error: %v", validationErr)
        }
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        expectedErr := errors.New("expected error")
        var ret map[string]interface{}
-       sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, expectedErr)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey}).Return(ret, expectedErr)
 
        res, rNibErr := w.GetE2TInstance(address)
        assert.NotNil(t, rNibErr)
@@ -1071,11 +1076,11 @@ func generateE2tInstance(address string) *entities.E2TInstance {
 }
 
 func TestGetE2TAddressesSdlError(t *testing.T) {
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        expectedErr := errors.New("expected error")
        var ret map[string]interface{}
-       sdlInstanceMock.On("Get", []string{E2TAddressesKey}).Return(ret, expectedErr)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{E2TAddressesKey}).Return(ret, expectedErr)
 
        res, rNibErr := w.GetE2TAddresses()
        assert.NotNil(t, rNibErr)
@@ -1084,7 +1089,7 @@ func TestGetE2TAddressesSdlError(t *testing.T) {
 
 func TestGetE2TAddressesSuccess(t *testing.T) {
        address := "10.10.2.15:9800"
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        e2tAddresses := []string{address}
        data, err := json.Marshal(e2tAddresses)
@@ -1095,7 +1100,7 @@ func TestGetE2TAddressesSuccess(t *testing.T) {
 
        var e error
        ret := map[string]interface{}{E2TAddressesKey: string(data)}
-       sdlInstanceMock.On("Get", []string{E2TAddressesKey}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{E2TAddressesKey}).Return(ret, e)
 
        res, rNibErr := w.GetE2TAddresses()
        assert.Nil(t, rNibErr)
@@ -1108,7 +1113,7 @@ func TestGetE2TInstancesSuccess(t *testing.T) {
        redisKey, _ := common.ValidateAndBuildE2TInstanceKey(address)
        redisKey2, _ := common.ValidateAndBuildE2TInstanceKey(address2)
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        e2tInstance1 := generateE2tInstance(address)
        e2tInstance2 := generateE2tInstance(address2)
@@ -1118,7 +1123,7 @@ func TestGetE2TInstancesSuccess(t *testing.T) {
 
        var e error
        ret := map[string]interface{}{redisKey: string(data1), redisKey2: string(data2)}
-       sdlInstanceMock.On("Get", []string{redisKey, redisKey2}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey, redisKey2}).Return(ret, e)
 
        res, err := w.GetE2TInstances([]string{address, address2})
        assert.Nil(t, err)
@@ -1131,14 +1136,14 @@ func TestGetE2TInstancesUnmarhalPartialSuccess(t *testing.T) {
        redisKey, _ := common.ValidateAndBuildE2TInstanceKey(address)
        redisKey2, _ := common.ValidateAndBuildE2TInstanceKey(address2)
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        e2tInstance1 := generateE2tInstance(address)
        data1, _ := json.Marshal(e2tInstance1)
 
        var e error
        ret := map[string]interface{}{redisKey: string(data1), redisKey2: "abc"}
-       sdlInstanceMock.On("Get", []string{redisKey, redisKey2}).Return(ret, e)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey, redisKey2}).Return(ret, e)
 
        res, err := w.GetE2TInstances([]string{address, address2})
        assert.Nil(t, err)
@@ -1151,9 +1156,9 @@ func TestGetE2TInstancesSdlFailure(t *testing.T) {
        redisKey, _ := common.ValidateAndBuildE2TInstanceKey(address)
        redisKey2, _ := common.ValidateAndBuildE2TInstanceKey(address2)
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
-       sdlInstanceMock.On("Get", []string{redisKey, redisKey2}).Return(map[string]interface{}{}, fmt.Errorf(""))
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey, redisKey2}).Return(map[string]interface{}{}, fmt.Errorf(""))
        _, err := w.GetE2TInstances([]string{address, address2})
        assert.IsType(t, &common.InternalError{}, err)
 }
@@ -1164,9 +1169,9 @@ func TestGetE2TInstancesEmptyData(t *testing.T) {
        redisKey, _ := common.ValidateAndBuildE2TInstanceKey(address)
        redisKey2, _ := common.ValidateAndBuildE2TInstanceKey(address2)
 
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
-       sdlInstanceMock.On("Get", []string{redisKey, redisKey2}).Return(map[string]interface{}{}, nil)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{redisKey, redisKey2}).Return(map[string]interface{}{}, nil)
        _, err := w.GetE2TInstances([]string{address, address2})
        assert.IsType(t, &common.ResourceNotFoundError{}, err)
 }
@@ -1174,10 +1179,10 @@ func TestGetE2TInstancesEmptyData(t *testing.T) {
 func TestGetGeneralConfiguration(t *testing.T) {
 
        key := common.BuildGeneralConfigurationKey()
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        configurationData := "{\"enableRic\":true}"
-       sdlInstanceMock.On("Get", []string{key}).Return(map[string]interface{}{key: configurationData}, nil)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(map[string]interface{}{key: configurationData}, nil)
 
        res, rNibErr := w.GetGeneralConfiguration()
        assert.Nil(t, rNibErr)
@@ -1187,9 +1192,9 @@ func TestGetGeneralConfiguration(t *testing.T) {
 func TestGetGeneralConfigurationNotFound(t *testing.T) {
 
        key := common.BuildGeneralConfigurationKey()
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
-       sdlInstanceMock.On("Get", []string{key}).Return(map[string]interface{}{}, nil)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(map[string]interface{}{}, nil)
 
        _, rNibErr := w.GetGeneralConfiguration()
 
@@ -1200,9 +1205,9 @@ func TestGetGeneralConfigurationNotFound(t *testing.T) {
 func TestGetGeneralConfigurationSdlFailure(t *testing.T) {
 
        key := common.BuildGeneralConfigurationKey()
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
-       sdlInstanceMock.On("Get", []string{key}).Return(map[string]interface{}{}, fmt.Errorf("sdl error"))
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(map[string]interface{}{}, fmt.Errorf("sdl error"))
 
        _, rNibErr := w.GetGeneralConfiguration()
 
@@ -1214,10 +1219,10 @@ func TestGetGeneralConfigurationSdlFailure(t *testing.T) {
 func TestGetGeneralConfigurationUnmarshalError(t *testing.T) {
 
        key := common.BuildGeneralConfigurationKey()
-       w, sdlInstanceMock := initSdlInstanceMock()
+       w, sdlInstanceMock := initSdlSyncStorageMock()
 
        configurationData := "{\"enableRic :true}"
-       sdlInstanceMock.On("Get", []string{key}).Return(map[string]interface{}{key: configurationData}, nil)
+       sdlInstanceMock.On("Get", common.GetRNibNamespace(), []string{key}).Return(map[string]interface{}{key: configurationData}, nil)
 
        _, rNibErr := w.GetGeneralConfiguration()
 
@@ -1383,4 +1388,4 @@ func TestGetGeneralConfigurationUnmarshalError(t *testing.T) {
 //     rnibReader := GetRNibReader(sdl)
 //     e2tInstances, _ := rnibReader.GetE2TInstances([]string{"e2t.att.com:38000","whatever"})
 //     assert.Len(t, e2tInstances, 1)
-//}
\ No newline at end of file
+//}