diff --git a/controller/controller.go b/controller/controller.go
index a8e715d8bbaaf2453992a79865b25190915c0519..1f3ba0e7f5dcb821eb24f8068b2269a73c065c4a 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -250,8 +250,6 @@ func createPrincipalNetworkDomain() error {
config.BasePndUUID,
"base",
"gosdn base pnd",
- //c.csbiClient,
- //callback,
)
err = c.pndStore.Add(pnd)
if err != nil {
diff --git a/controller/northbound/server/core.go b/controller/northbound/server/core.go
index ce68739377b637539ecee996f08b3365c143a8de..13027611838f126e34f15095e6dd709e831d499d 100644
--- a/controller/northbound/server/core.go
+++ b/controller/northbound/server/core.go
@@ -95,7 +95,7 @@ func (s CoreServer) CreatePndList(ctx context.Context, request *pb.CreatePndList
start := metrics.StartHook(labels, grpcRequestsTotal)
defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
for _, r := range request.Pnd {
- pnd := nucleus.NewPND(uuid.New(), r.Name, r.Description) //, s.csbiClient, s.pndCallbackFn)
+ pnd := nucleus.NewPND(uuid.New(), r.Name, r.Description)
if err := s.pndService.Add(pnd); err != nil {
return nil, handleRPCError(labels, err)
diff --git a/controller/northbound/server/networkElement.go b/controller/northbound/server/networkElement.go
index 518cb8149a5d454ebc1f314dff8d27b8b8ccf572..6a433b7dea0888bf04f1be9c8da200e161bfe1e6 100644
--- a/controller/northbound/server/networkElement.go
+++ b/controller/northbound/server/networkElement.go
@@ -606,7 +606,7 @@ func stringArrayToUUIDs(sid []string) ([]uuid.UUID, error) {
return UUIDs, nil
}
-// SetMneList updates the list of mnes.
+// SetMneList adds the list of mnes.
func (n *NetworkElementServer) SetMneList(ctx context.Context, request *mnepb.SetMneListRequest) (*mnepb.SetMneListResponse, error) {
labels := prometheus.Labels{"service": "mne", "rpc": "set"}
start := metrics.StartHook(labels, grpcRequestsTotal)
diff --git a/controller/nucleus/pndFilesystemStore.go b/controller/nucleus/pndFilesystemStore.go
index ea74c4e5e3f612eeea5b6d2cb5dff2486246b14e..386fc025a7da4f45123520b8b1967966dcfbc8e7 100644
--- a/controller/nucleus/pndFilesystemStore.go
+++ b/controller/nucleus/pndFilesystemStore.go
@@ -62,8 +62,6 @@ func (t *FilesystemPndStore) readAllPndsFromFile() ([]networkdomain.LoadedPnd, e
uuid.MustParse(loadedPND.ID),
loadedPND.Name,
loadedPND.Description,
- //csbiClient,
- //t.callback,
)
if err != nil {
return nil, err
diff --git a/controller/nucleus/pndFilesystemStore_test.go b/controller/nucleus/pndFilesystemStore_test.go
index 613ef935bcb8b8662a8e363be9d04bb202ce83b5..e4a1e69dc33353cead9fdfe8326d8c27a09a56df 100644
--- a/controller/nucleus/pndFilesystemStore_test.go
+++ b/controller/nucleus/pndFilesystemStore_test.go
@@ -15,7 +15,7 @@ func TestAddPnd(t *testing.T) {
pndStore := NewPndStore(pluginServiceMock)
pndID, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bad")
- pnd := NewPND(pndID, "testpnd", "test") //, pndID, nil, nil)
+ pnd := NewPND(pndID, "testpnd", "test")
err := pndStore.Add(pnd)
@@ -31,8 +31,8 @@ func TestGetAllPnds(t *testing.T) {
pndStore := NewPndStore(pluginServiceMock)
pndID1, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bad")
pndID2, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bab")
- pnd1 := NewPND(pndID1, "testpnd", "test") //, pndID1, nil, nil)
- pnd2 := NewPND(pndID2, "testpnd2", "test") //, pndID2, nil, nil)
+ pnd1 := NewPND(pndID1, "testpnd", "test")
+ pnd2 := NewPND(pndID2, "testpnd2", "test")
inputPnds := [2]networkdomain.NetworkDomain{pnd1, pnd2}
@@ -68,8 +68,8 @@ func TestGetPnd(t *testing.T) {
pndStore := NewPndStore(pluginServiceMock)
pndID1, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bad")
pndID2, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bab")
- pnd1 := NewPND(pndID1, "testpnd", "test") //, pndID1, nil, nil)
- pnd2 := NewPND(pndID2, "testpnd2", "test") //, pndID2, nil, nil)
+ pnd1 := NewPND(pndID1, "testpnd", "test")
+ pnd2 := NewPND(pndID2, "testpnd2", "test")
inputPnds := [2]networkdomain.NetworkDomain{pnd1, pnd2}
@@ -103,8 +103,8 @@ func TestDeletePnd(t *testing.T) {
pndStore := NewPndStore(pluginServiceMock)
pndID1, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bad")
pndID2, _ := uuid.Parse("b4016412-eec5-45a1-aa29-f59915357bab")
- pnd1 := NewPND(pndID1, "testpnd", "test") //, pndID1, nil, nil)
- pnd2 := NewPND(pndID2, "testpnd2", "test") //, pndID2, nil, nil)
+ pnd1 := NewPND(pndID1, "testpnd", "test")
+ pnd2 := NewPND(pndID2, "testpnd2", "test")
inputPnds := [2]networkdomain.NetworkDomain{pnd1, pnd2}
diff --git a/controller/nucleus/principalNetworkDomain.go b/controller/nucleus/principalNetworkDomain.go
index f2ecf4fd7d68f4cea0137e8a7f1051834be8c285..b9577dead6f7814154b800dbb85445df35163e72 100644
--- a/controller/nucleus/principalNetworkDomain.go
+++ b/controller/nucleus/principalNetworkDomain.go
@@ -9,26 +9,6 @@ import (
log "github.com/sirupsen/logrus"
)
-// // NewPND creates a Principle Network Domain.
-// func NewPND(
-// name string,
-// description string,
-// id uuid.UUID,
-// c cpb.CsbiServiceClient,
-// callback func(uuid.UUID, chan networkelement.Details),
-// ) (networkdomain.NetworkDomain, error) {
-// pnd := &pndImplementation{
-// Name: name,
-// Description: description,
-// Id: id,
-
-// csbiClient: c,
-// callback: callback,
-// }
-
-// return pnd, nil
-// }
-
// NewPNDEntity creates a PND object as it is stored in the storage.
func NewPND(pndID uuid.UUID, name string, description string) networkdomain.NetworkDomain {
pnd := &pndImplementation{
diff --git a/controller/topology/topologyService.go b/controller/topology/topologyService.go
index 4e344511e3d701fe393e0b3bfc8a2119b3859a35..f7934bf6c20332aaa64e24651fae1ca9102d1d5f 100644
--- a/controller/topology/topologyService.go
+++ b/controller/topology/topologyService.go
@@ -24,7 +24,7 @@ type Service interface {
GetAll() ([]links.Link, error)
}
-// TopoService is a TopoService for ports.
+// TopoService manages the links between nodes and their related ports.
type TopoService struct {
store Store
nodeService nodes.Service