Skip to content
Snippets Groups Projects
Commit 562b360b authored by Fabian Seidl's avatar Fabian Seidl
Browse files

adjust tests to fix errors

parent 537332d6
No related branches found
No related tags found
1 merge request!625Resolve "The mechanism to watch devices during controller start currently only supports watching the same path for each device"
This commit is part of merge request !625. Comments created here will be created in the context of that merge request.
......@@ -93,7 +93,7 @@ func TestPndAdapter_AddNetworkElement(t *testing.T) {
id: tt.fields.id,
endpoint: tt.fields.endpoint,
}
if _, err := p.AddNetworkElement(context.TODO(), tt.args.name, tt.args.opts, tt.args.sid); (err != nil) != tt.wantErr {
if _, err := p.AddNetworkElement(context.TODO(), tt.args.name, tt.args.opts, tt.args.sid, [][]string{}); (err != nil) != tt.wantErr {
t.Errorf("PndAdapter.AddNetworkElement() error = %v, wantErr %v", err, tt.wantErr)
}
})
......
......@@ -76,6 +76,7 @@ func TestApiIntegration(t *testing.T) {
opt,
suid,
puid,
[][]string{},
); (err != nil) != tt.wantErr {
t.Errorf("gosdn cli add-networkElement error = %v, wantErr %v", err, tt.wantErr)
return
......
......@@ -203,6 +203,7 @@ func bootstrapUnitTest() {
},
pndUUID,
pluginMock,
[][]string{},
conflict.Metadata{ResourceVersion: 0})
_ = networkElementService.Add(mne)
......
......@@ -40,7 +40,7 @@ func TestAddNetworkElement(t *testing.T) {
plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
networkElementStore := NewNetworkElementStore()
mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err := networkElementStore.Add(mne)
if err != nil {
......@@ -63,12 +63,12 @@ func TestGetAllNetworkElements(t *testing.T) {
transportOptions := returnBasicTransportOption()
mne1, err := NewNetworkElement("testname", mneID1, &transportOptions, defaultPndID, plugin, conflict.Metadata{})
mne1, err := NewNetworkElement("testname", mneID1, &transportOptions, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
mne2, err := NewNetworkElement("testname2", mneID2, &transportOptions, defaultPndID, plugin, conflict.Metadata{})
mne2, err := NewNetworkElement("testname2", mneID2, &transportOptions, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
......@@ -117,12 +117,12 @@ func TestGetNetworkElement(t *testing.T) {
trop := returnBasicTransportOption()
mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, conflict.Metadata{})
mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, conflict.Metadata{})
mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
......@@ -164,14 +164,14 @@ func TestUpdateNetworkElement(t *testing.T) {
plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
networkElementStore := NewNetworkElementStore()
mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err := networkElementStore.Add(mne)
if err != nil {
t.Error(err)
}
mne, _ = NewNetworkElement(updatedNetworkElementName, mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
mne, _ = NewNetworkElement(updatedNetworkElementName, mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err = networkElementStore.Update(mne)
if err != nil {
......@@ -206,12 +206,12 @@ func TestDeleteNetworkElement(t *testing.T) {
trop := returnBasicTransportOption()
mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, conflict.Metadata{})
mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, conflict.Metadata{})
mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment