Update test cases

controller/api/initialise_test.go

@@ -131,7 +131,7 @@ func bootstrapUnitTest() {
 	pluginMock.On("ID").Return(defaultPluginID)
 	pluginMock.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
 	pluginMock.On("GetNode", mock.Anything).Return([]*gpb.Notification{}, nil)
-	pluginMock.On("Model").Return([]byte(
+	pluginMock.On("Model", mock.Anything).Return([]byte(
 		"{\n\t\"Acl\": null,\n\t\"Bfd\": null,\n\t\"Components\": null,\n\t\"Interfaces\": null,\n\t\"Keychains\": null,\n\t\"Lldp\": null,\n\t\"Messages\": null,\n\t\"NetworkInstances\": null,\n\t\"RoutingPolicy\": null,\n\t\"System\": null\n}"),
 		nil,
 	)

controller/nucleus/initialise_test.go

@@ -98,7 +98,7 @@ func mockPlugin(t testing.TB) plugin.Plugin {
 	mockPlugin := &mocks.Plugin{}
 	mockPlugin.On("ID").Return(defaultPluginID)
 	mockPlugin.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
-	mockPlugin.On("Model").Return([]byte(
+	mockPlugin.On("Model", mock.Anything).Return([]byte(
 		"{\n\t\"Acl\": null,\n\t\"Bfd\": null,\n\t\"Components\": null,\n\t\"Interfaces\": null,\n\t\"Keychains\": null,\n\t\"Lldp\": null,\n\t\"Messages\": null,\n\t\"NetworkInstances\": null,\n\t\"RoutingPolicy\": null,\n\t\"System\": null\n}"),
 		nil,
 	)
@@ -156,7 +156,7 @@ func mockNetworkElement() networkelement.NetworkElement {
 	mockPlugin := &mocks.Plugin{}
 	mockPlugin.On("ID").Return(defaultPluginID)
 	mockPlugin.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
-	mockPlugin.On("Model").Return([]byte(
+	mockPlugin.On("Model", mock.Anything).Return([]byte(
 		"{\n\t\"Acl\": null,\n\t\"Bfd\": null,\n\t\"Components\": null,\n\t\"Interfaces\": null,\n\t\"Keychains\": null,\n\t\"Lldp\": null,\n\t\"Messages\": null,\n\t\"NetworkInstances\": null,\n\t\"RoutingPolicy\": null,\n\t\"System\": null\n}"),
 		nil,
 	)
@@ -169,12 +169,11 @@ func mockNetworkElement() networkelement.NetworkElement {
 	}
 }
 
-// TODO: return an error for pluginservice add!!
 func newPnd() (*pndImplementation, error) {
 	mockPlugin := &mocks.Plugin{}
 	mockPlugin.On("ID").Return(defaultPluginID)
 	mockPlugin.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
-	mockPlugin.On("Model").Return([]byte(
+	mockPlugin.On("Model", mock.Anything).Return([]byte(
 		"{\n\t\"Acl\": null,\n\t\"Bfd\": null,\n\t\"Components\": null,\n\t\"Interfaces\": null,\n\t\"Keychains\": null,\n\t\"Lldp\": null,\n\t\"Messages\": null,\n\t\"NetworkInstances\": null,\n\t\"RoutingPolicy\": null,\n\t\"System\": null\n}"),
 		nil,
 	)

controller/nucleus/networkElementFilesystemStore_test.go

@@ -9,6 +9,7 @@ import (
 	"code.fbi.h-da.de/danet/gosdn/controller/mocks"
 	"code.fbi.h-da.de/danet/gosdn/controller/store"
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/mock"
 )
 
 func returnBasicTransportOption() tpb.TransportOption {
@@ -37,7 +38,7 @@ func TestAddNetworkElement(t *testing.T) {
 
 	plugin1 := &mocks.Plugin{}
 	plugin1.On("ID").Return(pluginID1)
-	plugin1.On("Model").Return([]byte{}, nil)
+	plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
 
 	networkElementStore := NewNetworkElementStore(pndID)
 	mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, plugin1, conflict.Metadata{})
@@ -57,7 +58,7 @@ func TestGetAllNetworkElements(t *testing.T) {
 	pluginID, _ := uuid.Parse("ssssssss-ssss-ssss-ssss-ssssssssssss")
 	plugin := &mocks.Plugin{}
 	plugin.On("ID").Return(pluginID)
-	plugin.On("Model").Return([]byte{}, nil)
+	plugin.On("Model", mock.Anything).Return([]byte{}, nil)
 
 	mneID1, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
 	mneID2, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab")
@@ -112,7 +113,7 @@ func TestGetNetworkElement(t *testing.T) {
 	pluginID, _ := uuid.Parse("ssssssss-ssss-ssss-ssss-ssssssssssss")
 	plugin := &mocks.Plugin{}
 	plugin.On("ID").Return(pluginID)
-	plugin.On("Model").Return([]byte{}, nil)
+	plugin.On("Model", mock.Anything).Return([]byte{}, nil)
 
 	mneID1, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
 	mneID2, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab")
@@ -164,7 +165,7 @@ func TestUpdateNetworkElement(t *testing.T) {
 
 	plugin1 := &mocks.Plugin{}
 	plugin1.On("ID").Return(pluginID1)
-	plugin1.On("Model").Return([]byte{}, nil)
+	plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
 
 	networkElementStore := NewNetworkElementStore(pndID)
 	mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, plugin1, conflict.Metadata{})
@@ -203,7 +204,7 @@ func TestDeleteNetworkElement(t *testing.T) {
 	pluginID, _ := uuid.Parse("ssssssss-ssss-ssss-ssss-ssssssssssss")
 	plugin := &mocks.Plugin{}
 	plugin.On("ID").Return(pluginID)
-	plugin.On("Model").Return([]byte{}, nil)
+	plugin.On("Model", mock.Anything).Return([]byte{}, nil)
 
 	mneID1, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
 	mneID2, _ := uuid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab")

controller/nucleus/networkElementService_test.go

@@ -27,7 +27,7 @@ func getNetworkElementTestStores(t *testing.T, mneID uuid.UUID) (networkelement.
 	}
 	mockPlugin := &mocks.Plugin{}
 	mockPlugin.On("ID").Return(mockPluginID)
-	mockPlugin.On("Model").Return([]byte("hello"), nil)
+	mockPlugin.On("Model", mock.Anything).Return([]byte("hello"), nil)
 	mockPlugin.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
 	eventService := eventservice.NewMockEventService()
 	pluginStore := NewMemoryPluginStore()

controller/nucleus/principalNetworkDomain_test.go

@@ -91,7 +91,7 @@ func Test_pndImplementation_AddNetworkElement(t *testing.T) {
 				requestPluginFn: func(u uuid.UUID) (plugin.Plugin, error) {
 					mockPlugin := &mocks.Plugin{}
 					mockPlugin.On("ID").Return(u)
-					mockPlugin.On("Model").Return([]byte("mockModel"), nil)
+					mockPlugin.On("Model", mock.Anything).Return([]byte("mockModel"), nil)
 					return mockPlugin, nil
 				},
 			},
@@ -102,7 +102,7 @@ func Test_pndImplementation_AddNetworkElement(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			mockPlugin := &mocks.Plugin{}
 			mockPlugin.On("ID").Return(defaultPluginID)
-			mockPlugin.On("Model").Return([]byte("mockModel"), nil)
+			mockPlugin.On("Model", mock.Anything).Return([]byte("mockModel"), nil)
 			mockPlugin.On("Unmarshal", mock.Anything, mock.Anything).Return(nil)
 
 			pnd, err := newPnd()