From 0028fb9dc777efec20c07135df8f1d14b392fc40 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Mon, 31 May 2021 13:03:15 +0200
Subject: [PATCH] golint --fix
---
northbound/server/pnd.go | 2 +-
nucleus/change.go | 2 +-
nucleus/initialise_test.go | 2 --
test/integration/cmdIntegration_test.go | 1 -
test/integration/nucleusIntegration_test.go | 10 ----------
5 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
index 00bd6e0b4..ea12031e1 100644
--- a/northbound/server/pnd.go
+++ b/northbound/server/pnd.go
@@ -163,7 +163,7 @@ func fillOnds(pnd nucleus.PrincipalNetworkDomain, all bool, did ...string) ([]*p
onds := make([]*ppb.OrchestratedNetworkingDevice, len(ondList))
for i, id := range ondList {
- d, err := pnd.GetDevice(id)
+ d, err := pnd.GetDevice(id.String())
if err != nil {
return nil, err
}
diff --git a/nucleus/change.go b/nucleus/change.go
index 231f21704..c9f0c41e7 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -146,4 +146,4 @@ func (c *Change) State() ppb.Change_State {
} else {
return ppb.Change_CONFIRMED
}
-}
\ No newline at end of file
+}
diff --git a/nucleus/initialise_test.go b/nucleus/initialise_test.go
index f105c6869..e412a631d 100644
--- a/nucleus/initialise_test.go
+++ b/nucleus/initialise_test.go
@@ -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"
-
"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/nucleus/util/proto"
diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go
index e81b3c987..b91547203 100644
--- a/test/integration/cmdIntegration_test.go
+++ b/test/integration/cmdIntegration_test.go
@@ -1,7 +1,6 @@
package integration
import (
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"os"
"testing"
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index 294c6546e..4a5a29eeb 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -1,8 +1,6 @@
package integration
import (
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
"context"
"reflect"
"sort"
@@ -228,11 +226,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
name: "destination unreachable",
fields: fields{
opt: &tpb.TransportOption{
-<<<<<<< HEAD
Address: "203.0.113.10:6030",
-=======
- Address: "203.0.113.10:6030",
->>>>>>> 4a937a94 (nbi implementation done)
},
},
args: args{
@@ -309,11 +303,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
{
name: "destination unreachable",
fields: fields{opt: &tpb.TransportOption{
-<<<<<<< HEAD
Address: "203.0.113.10:6030",
-=======
- Address: "203.0.113.10:6030",
->>>>>>> 4a937a94 (nbi implementation done)
},
},
args: args{ctx: context.Background()},
--
GitLab