Resolve "Requesting information from the Controller via NBI takes very long"

Description

Related Issue

#230 (closed)

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

controller/northbound/server/pnd.go

@@ -8,6 +8,7 @@ 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/device"
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkdomain"
 	"code.fbi.h-da.de/danet/gosdn/controller/metrics"
 	"code.fbi.h-da.de/danet/gosdn/controller/nucleus"
@@ -52,7 +53,13 @@ func (p PndServer) GetOnd(ctx context.Context, request *ppb.GetOndRequest) (*ppb
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	ond, err := fillOndBySpecificPath(pnd, request.Did, "/")
+	device, err := pnd.GetDevice(request.Did)
+	if err != nil {
+		log.Error(err)
+		return nil, status.Errorf(codes.Aborted, "%v", err)
+	}
+
+	ond, err := fillOndBySpecificPath(pnd, device, "/")
 	if err != nil {
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
@@ -85,14 +92,15 @@ func (p PndServer) GetOndList(ctx context.Context, request *ppb.GetOndListReques
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	onds := make([]*ppb.OrchestratedNetworkingDevice, len(pnd.Devices()))
-	for i, ond := range pnd.Devices() {
-		ond, err := fillOndBySpecificPath(pnd, ond.ID().String(), "/")
+	onds := pnd.Devices()
+	ondsBySpecificPath := make([]*ppb.OrchestratedNetworkingDevice, len(onds))
+	for i, ond := range onds {
+		ond, err := fillOndBySpecificPath(pnd, ond, "/")
 		if err != nil {
 			log.Error(err)
 			return nil, status.Errorf(codes.Aborted, "%v", err)
 		}
-		onds[i] = ond
+		ondsBySpecificPath[i] = ond
 	}
 
 	return &ppb.GetOndListResponse{
@@ -102,17 +110,11 @@ func (p PndServer) GetOndList(ctx context.Context, request *ppb.GetOndListReques
 			Name:        pnd.GetName(),
 			Description: pnd.GetDescription(),
 		},
-		Ond: onds,
+		Ond: ondsBySpecificPath,
 	}, nil
 }
 
-func fillOndBySpecificPath(pnd networkdomain.NetworkDomain, did string, path string) (*ppb.OrchestratedNetworkingDevice, error) {
-	d, err := pnd.GetDevice(did)
-	if err != nil {
-		log.Error(err)
-		return nil, status.Errorf(codes.Aborted, "%v", err)
-	}
-
+func fillOndBySpecificPath(pnd networkdomain.NetworkDomain, d device.Device, path string) (*ppb.OrchestratedNetworkingDevice, error) {
 	gnmiPath, err := ygot.StringToStructuredPath(path)
 	if err != nil {
 		log.Error(err)
@@ -294,6 +296,12 @@ func (p PndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*p
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
+
+	device, err := pnd.GetDevice(request.Did)
+	if err != nil {
+		log.Error(err)
+		return nil, status.Errorf(codes.Aborted, "%v", err)
+	}
 	duid, err := uuid.Parse(request.Did)
 	if err != nil {
 		log.Error(err)
@@ -309,7 +317,7 @@ func (p PndServer) GetPath(ctx context.Context, request *ppb.GetPathRequest) (*p
 		return nil, status.Errorf(codes.Aborted, "%v", err)
 	}
 
-	ond, err := fillOndBySpecificPath(pnd, request.Did, path)
+	ond, err := fillOndBySpecificPath(pnd, device, path)
 	if err != nil {
 		log.Error(err)
 		return nil, status.Errorf(codes.Aborted, "%v", err)