feat: allow to differentiate between multiple grpc-based data sources (…

…#1776) Signed-off-by: Milan Lenco <[email protected]>
ligato · Jan 11, 2021 · a04d009 · a04d009
1 parent 27364fa
commit a04d009
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/plugins/configurator/configurator.go b/plugins/configurator/configurator.go
@@ -111,7 +111,12 @@ func (svc *configuratorServer) Update(ctx context.Context, req *pb.UpdateRequest
 		ctx = kvs.WithResync(ctx, kvs.FullResync, true)
 	}
 
-	ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	md, hasMeta := metadata.FromIncomingContext(ctx)
+	if hasMeta && len(md["datasrc"]) == 1 {
+		ctx = contextdecorator.DataSrcContext(ctx, md["datasrc"][0])
+	} else {
+		ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	}
 	results, err := svc.dispatch.PushData(ctx, kvPairs)
 
 	header := map[string]string{}
@@ -182,7 +187,12 @@ func (svc *configuratorServer) Delete(ctx context.Context, req *pb.DeleteRequest
 		})
 	}
 
-	ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	md, hasMeta := metadata.FromIncomingContext(ctx)
+	if hasMeta && len(md["datasrc"]) == 1 {
+		ctx = contextdecorator.DataSrcContext(ctx, md["datasrc"][0])
+	} else {
+		ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	}
 	results, err := svc.dispatch.PushData(ctx, kvPairs)
 
 	header := map[string]string{}

diff --git a/plugins/orchestrator/meta_service.go b/plugins/orchestrator/meta_service.go
@@ -27,6 +27,7 @@ import (
 	"go.ligato.io/vpp-agent/v3/proto/ligato/generic"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/reflect/protodesc"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -119,7 +120,12 @@ func (s *genericService) SetConfig(ctx context.Context, req *generic.SetConfigRe
 		})
 	}
 
-	ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	md, hasMeta := metadata.FromIncomingContext(ctx)
+	if hasMeta && len(md["datasrc"]) == 1 {
+		ctx = contextdecorator.DataSrcContext(ctx, md["datasrc"][0])
+	} else {
+		ctx = contextdecorator.DataSrcContext(ctx, "grpc")
+	}
 	if req.OverwriteAll {
 		ctx = kvs.WithResync(ctx, kvs.FullResync, true)
 	}