Skip to content
Snippets Groups Projects
Commit 0028fb9d authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

golint --fix

parent e8d797ea
No related branches found
No related tags found
1 merge request!155Northbound Interface
Pipeline #72647 failed
This commit is part of merge request !155. Comments created here will be created in the context of that merge request.
...@@ -163,7 +163,7 @@ func fillOnds(pnd nucleus.PrincipalNetworkDomain, all bool, did ...string) ([]*p ...@@ -163,7 +163,7 @@ func fillOnds(pnd nucleus.PrincipalNetworkDomain, all bool, did ...string) ([]*p
onds := make([]*ppb.OrchestratedNetworkingDevice, len(ondList)) onds := make([]*ppb.OrchestratedNetworkingDevice, len(ondList))
for i, id := range ondList { for i, id := range ondList {
d, err := pnd.GetDevice(id) d, err := pnd.GetDevice(id.String())
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -146,4 +146,4 @@ func (c *Change) State() ppb.Change_State { ...@@ -146,4 +146,4 @@ func (c *Change) State() ppb.Change_State {
} else { } else {
return ppb.Change_CONFIRMED return ppb.Change_CONFIRMED
} }
} }
\ No newline at end of file
...@@ -7,8 +7,6 @@ import ( ...@@ -7,8 +7,6 @@ import (
tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport" tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi" "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
"code.fbi.h-da.de/cocsn/gosdn/mocks" "code.fbi.h-da.de/cocsn/gosdn/mocks"
"code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto" "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
......
package integration package integration
import ( import (
tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"os" "os"
"testing" "testing"
......
package integration package integration
import ( import (
spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"context" "context"
"reflect" "reflect"
"sort" "sort"
...@@ -228,11 +226,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) { ...@@ -228,11 +226,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
name: "destination unreachable", name: "destination unreachable",
fields: fields{ fields: fields{
opt: &tpb.TransportOption{ opt: &tpb.TransportOption{
<<<<<<< HEAD
Address: "203.0.113.10:6030", Address: "203.0.113.10:6030",
=======
Address: "203.0.113.10:6030",
>>>>>>> 4a937a94 (nbi implementation done)
}, },
}, },
args: args{ args: args{
...@@ -309,11 +303,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) { ...@@ -309,11 +303,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
{ {
name: "destination unreachable", name: "destination unreachable",
fields: fields{opt: &tpb.TransportOption{ fields: fields{opt: &tpb.TransportOption{
<<<<<<< HEAD
Address: "203.0.113.10:6030", Address: "203.0.113.10:6030",
=======
Address: "203.0.113.10:6030",
>>>>>>> 4a937a94 (nbi implementation done)
}, },
}, },
args: args{ctx: context.Background()}, args: args{ctx: context.Background()},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment