From 670d46352acca504b0d4a25c19aaf61ac0e633bb Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Tue, 13 Apr 2021 18:00:48 -0500 Subject: [PATCH] Fixes for https://github.com/networkservicemesh/sdk-vpp/pull/156 Changes to reverse server chain elements to make decisions on the outbound direction of the call and take action on the return direction of the call in sdk-vpp: https://github.com/networkservicemesh/sdk-vpp/pull/156 Required adaptation (another example is in cmd-forwarder-vpp: https://github.com/networkservicemesh/cmd-forwarder-vpp/pull/124 ) Signed-off-by: Ed Warnicke --- main.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 9f383c9..43e3d2e 100644 --- a/main.go +++ b/main.go @@ -50,7 +50,6 @@ import ( "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/sendfd" "github.com/networkservicemesh/sdk/pkg/networkservice/core/chain" "github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam" - "github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata" registryrefresh "github.com/networkservicemesh/sdk/pkg/registry/common/refresh" registrysendfd "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd" registrychain "github.com/networkservicemesh/sdk/pkg/registry/core/chain" @@ -170,15 +169,14 @@ func main() { 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(), + up.NewServer(ctx, vppConn), + connectioncontext.NewServer(vppConn), + tag.NewServer(ctx, vppConn), + memif.NewServer(vppConn), ), }), - sendfd.NewServer()), + ), ) // ******************************************************************************** log.FromContext(ctx).Infof("executing phase 5: create grpc server and register icmp-server")