Reverse so that 'server' things happen before the 'connect' for client.

pkg/networkservice/chains/xconnectns/server.go

@@ -24,6 +24,7 @@ import (
 	"net/url"
 
 	"git.fd.io/govpp.git/api"
+	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
 	"google.golang.org/grpc"
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
@@ -32,24 +33,22 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/clienturl"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/connect"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/heal"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/recvfd"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/sendfd"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/supported"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanismtranslation"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 	"github.com/networkservicemesh/sdk/pkg/tools/addressof"
 	"github.com/networkservicemesh/sdk/pkg/tools/token"
 
+	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up"
+	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/xconnect"
+
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontextkernel"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/kernel"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/memif"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/vxlan"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/stats"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/tag"
-	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up"
-	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/xconnect"
 )
 
 // Connection aggregates the api.Connection and api.ChannelProvider interfaces
@@ -66,17 +65,21 @@ type xconnectNSServer struct {
 func NewServer(ctx context.Context, name string, authzServer networkservice.NetworkServiceServer, tokenGenerator token.GeneratorFunc, clientURL *url.URL, vppConn Connection, tunnelIP net.IP, clientDialOptions ...grpc.DialOption) endpoint.Endpoint {
 	rv := &xconnectNSServer{}
 	additionalFunctionality := []networkservice.NetworkServiceServer{
-		supported.NewServer(supported.WithSupportedMechanismTypes(
-			memif.MECHANISM,
-			kernel.MECHANISM,
-			vxlan.MECHANISM,
-		)),
-		metadata.NewServer(),
 		recvfd.NewServer(),
+		sendfd.NewServer(),
 		stats.NewServer(ctx),
 		// Statically set the url we use to the unix file socket for the NSMgr
 		clienturl.NewServer(clientURL),
 		heal.NewServer(ctx, addressof.NetworkServiceClient(adapters.NewServerToClient(rv))),
+		up.NewServer(ctx, vppConn),
+		xconnect.NewServer(vppConn),
+		connectioncontextkernel.NewServer(),
+		tag.NewServer(ctx, vppConn),
+		mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
+			memif.MECHANISM:  memif.NewServer(vppConn),
+			kernel.MECHANISM: kernel.NewServer(vppConn),
+			vxlan.MECHANISM:  vxlan.NewServer(vppConn, tunnelIP),
+		}),
 		connect.NewServer(
 			ctx,
 			func(ctx context.Context, cc grpc.ClientConnInterface) networkservice.NetworkServiceClient {
@@ -99,16 +102,6 @@ func NewServer(ctx context.Context, name string, authzServer networkservice.Netw
 			},
 			connect.WithDialOptions(clientDialOptions...),
 		),
-		mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
-			memif.MECHANISM:  memif.NewServer(vppConn),
-			kernel.MECHANISM: kernel.NewServer(vppConn),
-			vxlan.MECHANISM:  vxlan.NewServer(vppConn, tunnelIP),
-		}),
-		tag.NewServer(ctx, vppConn),
-		connectioncontextkernel.NewServer(),
-		xconnect.NewServer(vppConn),
-		up.NewServer(ctx, vppConn),
-		sendfd.NewServer(),
 	}
 
 	rv.Endpoint = endpoint.NewServer(ctx, tokenGenerator,

pkg/networkservice/connectioncontext/ipcontext/ipaddress/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -59,10 +59,15 @@ func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 }
 
 func (i *ipaddressServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := addDel(ctx, request.GetConnection(), i.vppConn, metadata.IsClient(i), true); err != nil {
+	conn, err := next.Server(ctx).Request(ctx, request)
+	if err != nil {
 		return nil, err
 	}
-	return next.Server(ctx).Request(ctx, request)
+	if err := addDel(ctx, conn, i.vppConn, metadata.IsClient(i), true); err != nil {
+		_, _ = i.Close(ctx, conn)
+		return nil, err
+	}
+	return conn, nil
 }
 
 func (i *ipaddressServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/connectioncontext/ipcontext/routes/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -60,10 +60,15 @@ func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 }
 
 func (r *routesServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := addDel(ctx, request.GetConnection(), r.vppConn, metadata.IsClient(r), true); err != nil {
+	conn, err := next.Server(ctx).Request(ctx, request)
+	if err != nil {
 		return nil, err
 	}
-	return next.Server(ctx).Request(ctx, request)
+	if err := addDel(ctx, conn, r.vppConn, metadata.IsClient(r), true); err != nil {
+		_, _ = r.Close(ctx, conn)
+		return nil, err
+	}
+	return conn, nil
 }
 
 func (r *routesServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/connectioncontext/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -20,9 +20,10 @@ package connectioncontext
 
 import (
 	"git.fd.io/govpp.git/api"
-	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 
+	"github.com/networkservicemesh/api/pkg/api/networkservice"
+
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext/ipcontext/ipaddress"
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext/ipcontext/routes"
 )
@@ -51,7 +52,7 @@ import (
 //
 func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 	return chain.NewNetworkServiceServer(
-		ipaddress.NewServer(vppConn),
 		routes.NewServer(vppConn),
+		ipaddress.NewServer(vppConn),
 	)
 }

pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -59,10 +59,15 @@ func NewServer() networkservice.NetworkServiceServer {
 }
 
 func (i *ipaddressServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := create(ctx, request.GetConnection(), metadata.IsClient(i)); err != nil {
+	conn, err := next.Server(ctx).Request(ctx, request)
+	if err != nil {
 		return nil, err
 	}
-	return next.Server(ctx).Request(ctx, request)
+	if err := create(ctx, conn, metadata.IsClient(i)); err != nil {
+		_, _ = i.Close(ctx, conn)
+		return nil, err
+	}
+	return conn, nil
 }
 
 func (i *ipaddressServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/connectioncontextkernel/ipcontext/routes/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -58,10 +58,15 @@ func NewServer() networkservice.NetworkServiceServer {
 }
 
 func (i *routesServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := create(ctx, request.GetConnection(), metadata.IsClient(i)); err != nil {
+	conn, err := next.Server(ctx).Request(ctx, request)
+	if err != nil {
 		return nil, err
 	}
-	return next.Server(ctx).Request(ctx, request)
+	if err := create(ctx, conn, metadata.IsClient(i)); err != nil {
+		_, _ = i.Close(ctx, conn)
+		return nil, err
+	}
+	return conn, nil
 }
 
 func (i *routesServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/connectioncontextkernel/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -52,7 +52,7 @@ import (
 //
 func NewServer() networkservice.NetworkServiceServer {
 	return chain.NewNetworkServiceServer(
-		ipaddress.NewServer(),
 		routes.NewServer(),
+		ipaddress.NewServer(),
 	)
 }

pkg/networkservice/mechanisms/kernel/kerneltap/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -41,14 +41,15 @@ func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 }
 
 func (k *kernelTapServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := create(ctx, request.GetConnection(), k.vppConn, metadata.IsClient(k)); err != nil {
-		return nil, err
-	}
 	conn, err := next.Server(ctx).Request(ctx, request)
 	if err != nil {
-		_ = del(ctx, conn, k.vppConn, false)
+		return nil, err
+	}
+	if err := create(ctx, conn, k.vppConn, metadata.IsClient(k)); err != nil {
+		_, _ = k.Close(ctx, conn)
+		return nil, err
 	}
-	return conn, err
+	return conn, nil
 }
 
 func (k *kernelTapServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/mechanisms/kernel/kernelvethpair/afpacket/client.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

pkg/networkservice/mechanisms/kernel/kernelvethpair/afpacket/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -25,6 +25,7 @@ import (
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
+	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 )
 
 type afPacketServer struct {
@@ -39,14 +40,15 @@ func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 }
 
 func (a *afPacketServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := create(ctx, request.GetConnection(), a.vppConn, false); err != nil {
-		return nil, err
-	}
 	conn, err := next.Server(ctx).Request(ctx, request)
 	if err != nil {
-		_ = del(ctx, conn, a.vppConn, false)
+		return nil, err
+	}
+	if err := create(ctx, conn, a.vppConn, metadata.IsClient(a)); err != nil {
+		_, _ = a.Close(ctx, conn)
+		return nil, err
 	}
-	return conn, err
+	return conn, nil
 }
 
 func (a *afPacketServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go

@@ -26,9 +26,10 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
 
+	"github.com/networkservicemesh/sdk/pkg/tools/log"
+
 	"github.com/networkservicemesh/sdk-vpp/pkg/tools/ethtool"
 	"github.com/networkservicemesh/sdk-vpp/pkg/tools/link"
-	"github.com/networkservicemesh/sdk/pkg/tools/log"
 
 	"github.com/pkg/errors"
 	"github.com/thanhpk/randstr"

pkg/networkservice/mechanisms/kernel/kernelvethpair/ipneighbor/server.go

@@ -44,10 +44,15 @@ func (i *ipneighborServer) Request(ctx context.Context, request *networkservice.
 	if request.GetConnection().GetPayload() != payload.IP {
 		return next.Server(ctx).Request(ctx, request)
 	}
-	if err := addDel(ctx, request.GetConnection(), i.vppConn, metadata.IsClient(i), true); err != nil {
+	conn, err := next.Server(ctx).Request(ctx, request)
+	if err != nil {
 		return nil, err
 	}
-	return next.Server(ctx).Request(ctx, request)
+	if err := addDel(ctx, conn, i.vppConn, metadata.IsClient(i), true); err != nil {
+		_, _ = i.Close(ctx, conn)
+		return nil, err
+	}
+	return conn, nil
 }
 
 func (i *ipneighborServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {

pkg/networkservice/mechanisms/kernel/kernelvethpair/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2021 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -23,24 +23,26 @@ import (
 
 	"git.fd.io/govpp.git/api"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
 
+	"github.com/networkservicemesh/api/pkg/api/networkservice"
+
+	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/kernel/kernelvethpair/ipneighbor"
+
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/kernel/kernelvethpair/afpacket"
-	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/kernel/kernelvethpair/ipneighbor"
 )
 
 type kernelVethPairServer struct{}
 
 // NewServer - return a new Server chain element implementing the kernel mechanism with vpp using a veth pair
 func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 	return chain.NewNetworkServiceServer(
-		&kernelVethPairServer{},
-		afpacket.NewServer(vppConn),
 		ipneighbor.NewServer(vppConn),
+		afpacket.NewServer(vppConn),
+		&kernelVethPairServer{},
 	)
 }
 

pkg/networkservice/mechanisms/memif/server.go

@@ -39,12 +39,12 @@ func NewServer(vppConn api.Connection) networkservice.NetworkServiceServer {
 }
 
 func (m *memifServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	if err := create(ctx, request.GetConnection(), m.vppConn, metadata.IsClient(m)); err != nil {
-		return nil, err
-	}
 	conn, err := next.Server(ctx).Request(ctx, request)
 	if err != nil {
-		_ = del(ctx, conn, m.vppConn, metadata.IsClient(m))
+		return nil, err
+	}
+	if err := create(ctx, conn, m.vppConn, metadata.IsClient(m)); err != nil {
+		_, _ = m.Close(ctx, conn)
 		return nil, err
 	}
 	return conn, nil

pkg/networkservice/mechanisms/vxlan/server.go

@@ -52,12 +52,16 @@ func (v *vxlanServer) Request(ctx context.Context, request *networkservice.Netwo
 	if request.GetConnection().GetPayload() != payload.Ethernet {
 		return next.Server(ctx).Request(ctx, request)
 	}
-	if err := addDel(ctx, request.GetConnection(), v.vppConn, true, metadata.IsClient(v)); err != nil {
-		return nil, err
-	}
 	conn, err := next.Server(ctx).Request(ctx, request)
 	if err != nil {
-		_ = addDel(ctx, request.GetConnection(), v.vppConn, false, metadata.IsClient(v))
+		return nil, err
+	}
+
+	if err := addDel(ctx, conn, v.vppConn, true, metadata.IsClient(v)); err != nil {
+		_, _ = v.Close(ctx, conn)
+		return nil, err
+	}
+	if err := addDel(ctx, request.GetConnection(), v.vppConn, true, metadata.IsClient(v)); err != nil {
 		return nil, err
 	}
 	return conn, nil