updated descriptions, removed commented code from PND constructor

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 {

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)

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)

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

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}
 

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{

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