fixed issue with nil sbiService when fetching schema

controller/northbound/server/auth_interceptor_test.go

@@ -38,10 +38,13 @@ func getTestAuthInterceptorServer(t *testing.T) (*AuthInterceptor, *UserServer,
 		t.Fatal(err)
 	}
 
+	sbiStore := nucleus.NewSbiStore()
+	sbiService := nucleus.NewSbiService(sbiStore, eventService)
+
 	s := NewAuthInterceptor(jwtManager, userService, roleService)
 	u := NewUserServer(jwtManager, userService)
 	r := NewRoleServer(jwtManager, roleService)
-	sbiServer := NewSbiServer(pndService)
+	sbiServer := NewSbiServer(sbiService)
 
 	if err := clearAndCreateAuthTestSetup(userService, roleService); err != nil {
 		t.Fatal(err)

controller/northbound/server/nbi.go

@@ -55,7 +55,7 @@ func NewNBI(
 		Pnd:            NewPndServer(pndService, sbiService),
 		Core:           NewCoreServer(pndService),
 		Csbi:           NewCsbiServer(pnds),
-		Sbi:            NewSbiServer(pndService),
+		Sbi:            NewSbiServer(sbiService),
 		Auth:           NewAuthServer(&jwt, users),
 		User:           NewUserServer(&jwt, users),
 		Role:           NewRoleServer(&jwt, roles),

controller/northbound/server/sbi.go

@@ -6,7 +6,7 @@ import (
 	"io"
 
 	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/store"
 	"github.com/google/uuid"
@@ -27,13 +27,13 @@ const (
 // SbiServer represents a sbi server.
 type SbiServer struct {
 	spb.UnimplementedSbiServiceServer
-	pndService networkdomain.Service
+	sbiService southbound.Service
 }
 
 // NewSbiServer receives a pndStore and returns a new sbiServer.
-func NewSbiServer(pndService networkdomain.Service) *SbiServer {
+func NewSbiServer(sbiService southbound.Service) *SbiServer {
 	return &SbiServer{
-		pndService: pndService,
+		sbiService: sbiService,
 	}
 }
 
@@ -43,22 +43,12 @@ func (s SbiServer) GetSchema(request *spb.GetSchemaRequest, stream spb.SbiServic
 	start := metrics.StartHook(labels, grpcRequestsTotal)
 	defer metrics.FinishHook(labels, start, grpcRequestDurationSecondsTotal, grpcRequestDurationSeconds)
 
-	pid, err := uuid.Parse(request.Pid)
-	if err != nil {
-		return handleRPCError(labels, err)
-	}
-
 	sid, err := uuid.Parse(request.Sid)
 	if err != nil {
 		return handleRPCError(labels, err)
 	}
 
-	pnd, err := s.pndService.Get(store.Query{ID: pid})
-	if err != nil {
-		return handleRPCError(labels, err)
-	}
-
-	sbi, err := pnd.GetSBI(sid)
+	sbi, err := s.sbiService.Get(store.Query{ID: sid})
 	if err != nil {
 		return handleRPCError(labels, err)
 	}