Fixes for update from sdk-vpp

Signed-off-by: Ed Warnicke <hagbard@gmail.com>
networkservicemesh · Mar 16, 2021 · 3b5c8d2 · 3b5c8d2
1 parent 3ea80a7
commit 3b5c8d2
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/main.go b/main.go
@@ -161,24 +161,25 @@ func main() {
 	// ********************************************************************************
 	vppConn, vppErrCh := vpphelper.StartAndDialContext(ctx)
 	exitOnErr(ctx, cancel, vppErrCh)
-
 	responderEndpoint := endpoint.NewServer(
 		ctx,
-		config.Name,
-		authorize.NewServer(),
 		spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime),
-		point2pointipam.NewServer(ipnet),
-		mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
-			memif.MECHANISM: chain.NewNetworkServiceServer(
-				metadata.NewServer(),
-				memif.NewServer(vppConn),
-				tag.NewServer(ctx, vppConn),
-				connectioncontext.NewServer(vppConn),
-				up.NewServer(ctx, vppConn),
-				sendfd.NewServer(),
-			),
-		}),
-		sendfd.NewServer(),
+		endpoint.WithName(config.Name),
+		endpoint.WithAuthorizeServer(authorize.NewServer()),
+		endpoint.WithAdditionalFunctionality(
+			point2pointipam.NewServer(ipnet),
+			mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
+				memif.MECHANISM: chain.NewNetworkServiceServer(
+					metadata.NewServer(),
+					memif.NewServer(vppConn),
+					tag.NewServer(ctx, vppConn),
+					connectioncontext.NewServer(vppConn),
+					up.NewServer(ctx, vppConn),
+					sendfd.NewServer(),
+				),
+			}),
+			sendfd.NewServer(),
+		),
 	)
 	// ********************************************************************************
 	log.FromContext(ctx).Infof("executing phase 5: create grpc server and register icmp-server")