Merge "merge of Natalia - change rnib errors"

[ric-plt/e2mgr.git] / E2Manager / mocks / rnibReaderMock.go

diff --git a/E2Manager/mocks/rnibReaderMock.go b/E2Manager/mocks/rnibReaderMock.go
index 43f9d90..5ac4b20 100644 (file)
--- a/E2Manager/mocks/rnibReaderMock.go
+++ b/E2Manager/mocks/rnibReaderMock.go
@@ -17,7 +17,6 @@
 package mocks
 
 import (
-       "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/stretchr/testify/mock"
 )
@@ -26,123 +25,123 @@ type RnibReaderMock struct {
        mock.Mock
 }
 
-func (m *RnibReaderMock) GetNodeb(inventoryName string) (*entities.NodebInfo, common.IRNibError) {
+func (m *RnibReaderMock) GetNodeb(inventoryName string) (*entities.NodebInfo, error) {
        args := m.Called(inventoryName)
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*entities.NodebInfo), errArg.(common.IRNibError);
+               return args.Get(0).(*entities.NodebInfo), errArg.(error);
        }
 
        return args.Get(0).(*entities.NodebInfo), nil
 }
 
-func (m *RnibReaderMock) GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, common.IRNibError) {
+func (m *RnibReaderMock) GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, error) {
        args := m.Called(nodeType, globalNbId)
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*entities.NodebInfo), errArg.(common.IRNibError);
+               return args.Get(0).(*entities.NodebInfo), errArg.(error);
        }
 
        return args.Get(0).(*entities.NodebInfo), nil
 }
 
-func (m *RnibReaderMock) GetCellList(inventoryName string) (*entities.Cells, common.IRNibError) {
+func (m *RnibReaderMock) GetCellList(inventoryName string) (*entities.Cells, error) {
        args := m.Called(inventoryName)
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*entities.Cells), errArg.(common.IRNibError);
+               return args.Get(0).(*entities.Cells), errArg.(error);
        }
 
        return args.Get(0).(*entities.Cells), nil
 }
 
-func (m *RnibReaderMock) GetListGnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
+func (m *RnibReaderMock) GetListGnbIds() ([]*entities.NbIdentity, error) {
        args := m.Called()
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*[]*entities.NbIdentity), errArg.(common.IRNibError);
+               return args.Get(0).([]*entities.NbIdentity), errArg.(error);
        }
 
-       return args.Get(0).(*[]*entities.NbIdentity), nil
+       return args.Get(0).([]*entities.NbIdentity), nil
 }
 
-func (m *RnibReaderMock) GetListEnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
+func (m *RnibReaderMock) GetListEnbIds() ([]*entities.NbIdentity, error) {
        args := m.Called()
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*[]*entities.NbIdentity), errArg.(common.IRNibError);
+               return args.Get(0).([]*entities.NbIdentity), errArg.(error);
        }
 
-       return args.Get(0).(*[]*entities.NbIdentity), nil
+       return args.Get(0).([]*entities.NbIdentity), nil
 
 }
 
-func (m *RnibReaderMock) GetCountGnbList() (int, common.IRNibError) {
+func (m *RnibReaderMock) GetCountGnbList() (int, error) {
        args := m.Called()
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Int(0), errArg.(common.IRNibError);
+               return args.Int(0), errArg.(error);
        }
 
        return args.Int(0), nil
 
 }
 
-func (m *RnibReaderMock) GetCell(inventoryName string, pci uint32) (*entities.Cell, common.IRNibError) {
+func (m *RnibReaderMock) GetCell(inventoryName string, pci uint32) (*entities.Cell, error) {
        args := m.Called(inventoryName, pci)
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*entities.Cell), errArg.(common.IRNibError);
+               return args.Get(0).(*entities.Cell), errArg.(error);
        }
 
        return args.Get(0).(*entities.Cell), nil
 }
 
-func (m *RnibReaderMock) GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, common.IRNibError) {
+func (m *RnibReaderMock) GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, error) {
        args := m.Called(cellType, cellId)
 
        errArg := args.Get(1);
 
        if errArg != nil {
-               return args.Get(0).(*entities.Cell), errArg.(common.IRNibError);
+               return args.Get(0).(*entities.Cell), errArg.(error);
        }
 
        return args.Get(0).(*entities.Cell), nil
 }
 
-func (m *RnibReaderMock) GetListNodebIds() ([]*entities.NbIdentity, common.IRNibError) {
+func (m *RnibReaderMock) GetListNodebIds() ([]*entities.NbIdentity, error) {
        args := m.Called()
 
        errArg := args.Get(1)
 
        if errArg != nil {
-               return args.Get(0).([]*entities.NbIdentity), errArg.(common.IRNibError)
+               return args.Get(0).([]*entities.NbIdentity), errArg.(error)
        }
 
        return args.Get(0).([]*entities.NbIdentity), nil
 }
 
-func (m *RnibReaderMock) GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, common.IRNibError) {
+func (m *RnibReaderMock) GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, error) {
        args := m.Called()
 
        errArg := args.Get(1)
 
        if errArg != nil {
-               return args.Get(0).(*entities.RanLoadInformation), errArg.(common.IRNibError)
+               return args.Get(0).(*entities.RanLoadInformation), errArg.(error)
        }
 
        return args.Get(0).(*entities.RanLoadInformation), nil