From e8d797ea7cb00863b08170fed27c5d48aefbbc32 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Fri, 28 May 2021 18:42:13 +0200
Subject: [PATCH] golint --fix
---
controller.go | 1 -
northbound/server/pnd.go | 8 --------
nucleus/change.go | 1 -
nucleus/gnmi_transport.go | 1 -
nucleus/gnmi_transport_test.go | 3 ---
5 files changed, 14 deletions(-)
diff --git a/controller.go b/controller.go
index cc648ed38..0f5b4085f 100644
--- a/controller.go
+++ b/controller.go
@@ -1,7 +1,6 @@
package gosdn
import (
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
"context"
"net"
"net/http"
diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
index 23f8e5524..00bd6e0b4 100644
--- a/northbound/server/pnd.go
+++ b/northbound/server/pnd.go
@@ -288,11 +288,7 @@ func handleSetSbi(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetSbi) (*ppb.S
}
func handleSetChange(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetChange) (*ppb.SetResponse, error) {
-<<<<<<< HEAD
for _, r := range req {
-=======
- for _,r := range req {
->>>>>>> 4a937a94 (nbi implementation done)
cuid, err := uuid.Parse(r.Cuid)
if err != nil {
return nil, err
@@ -320,11 +316,7 @@ func handleSetChange(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetChange) (
}
func handleChangeRequest(pnd nucleus.PrincipalNetworkDomain, req []*ppb.ChangeRequest) (*ppb.SetResponse, error) {
-<<<<<<< HEAD
for _, r := range req {
-=======
- for _,r := range req {
->>>>>>> 4a937a94 (nbi implementation done)
did, err := uuid.Parse(r.Id)
if err != nil {
return nil, err
diff --git a/nucleus/change.go b/nucleus/change.go
index baadc1afc..231f21704 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -1,7 +1,6 @@
package nucleus
import (
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
"errors"
"os"
"sync"
diff --git a/nucleus/gnmi_transport.go b/nucleus/gnmi_transport.go
index c293bc3eb..1834ce7e1 100644
--- a/nucleus/gnmi_transport.go
+++ b/nucleus/gnmi_transport.go
@@ -1,7 +1,6 @@
package nucleus
import (
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
"context"
"reflect"
diff --git a/nucleus/gnmi_transport_test.go b/nucleus/gnmi_transport_test.go
index 6e61ffe3a..e7fa677b5 100644
--- a/nucleus/gnmi_transport_test.go
+++ b/nucleus/gnmi_transport_test.go
@@ -9,9 +9,6 @@ import (
spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- 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/yang-models/generated/openconfig"
--
GitLab