From e018ae419f76cd2f4d13bd08ad06781cf2b70c83 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Thu, 26 Jan 2023 16:12:39 +0100
Subject: [PATCH] some linter pleasing
---
controller/northbound/server/networkElement.go | 8 +++++++-
controller/northbound/server/pnd.go | 2 --
controller/nucleus/principalNetworkDomain.go | 1 +
controller/topology/topologyService.go | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/controller/northbound/server/networkElement.go b/controller/northbound/server/networkElement.go
index c5036cdaf..80e1809e2 100644
--- a/controller/northbound/server/networkElement.go
+++ b/controller/northbound/server/networkElement.go
@@ -184,11 +184,17 @@ func (n *NetworkElementServer) Update(ctx context.Context, request *mnepb.Update
if err != nil {
return &mnepb.UpdateNetworkElementResponse{
Timestamp: time.Now().UnixNano(),
- Status: mnepb.Status_STATUS_OK,
+ Status: mnepb.Status_STATUS_ERROR,
}, err
}
err = n.ensureIntendedConfigurationIsAppliedOnNetworkElement(mneID)
+ if err != nil {
+ return &mnepb.UpdateNetworkElementResponse{
+ Timestamp: time.Now().UnixNano(),
+ Status: mnepb.Status_STATUS_ERROR,
+ }, err
+ }
return &mnepb.UpdateNetworkElementResponse{
Timestamp: time.Now().UnixNano(),
diff --git a/controller/northbound/server/pnd.go b/controller/northbound/server/pnd.go
index dc2854939..0ad3c2b98 100644
--- a/controller/northbound/server/pnd.go
+++ b/controller/northbound/server/pnd.go
@@ -7,7 +7,6 @@ import (
ppb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/pnd"
spb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/southbound"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain"
- "code.fbi.h-da.de/danet/gosdn/controller/interfaces/southbound"
"code.fbi.h-da.de/danet/gosdn/controller/metrics"
"code.fbi.h-da.de/danet/gosdn/controller/nucleus"
"code.fbi.h-da.de/danet/gosdn/controller/store"
@@ -22,7 +21,6 @@ import (
type PndServer struct {
ppb.UnimplementedPndServiceServer
pndService networkdomain.Service
- sbiService southbound.Service
}
// NewPndServer receives a pndStore and returns a new pndServer.
diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index fe5e765ae..f2b53f0f8 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -108,6 +108,7 @@ func NewPND(
return pnd, nil
}
+// NewPNDEntity creates a PND object as it is stored in the storage.
func NewPNDEntity(pndID uuid.UUID, name string, description string) networkdomain.NetworkDomain {
pnd := &pndImplementation{
Id: pndID,
diff --git a/controller/topology/topologyService.go b/controller/topology/topologyService.go
index c48824efa..4e344511e 100644
--- a/controller/topology/topologyService.go
+++ b/controller/topology/topologyService.go
@@ -144,7 +144,7 @@ func (t *TopoService) GetAll() ([]links.Link, error) {
return topo, nil
}
-// GetAll returns the current topology.
+// Get returns the current topology.
func (t *TopoService) Get(query query.Query) (links.Link, error) {
link, err := t.store.Get(query)
if err != nil {
--
GitLab