fix: Filter mechanism chain element works incorrectly in remote case (n…

…etworkservicemesh#576)

* Revert "fix: Filter mechanism chain element works incorrectly in remote case (networkservicemesh#575)"

This reverts commit 39537ac.

Signed-off-by: denis-tingajkin <denis.tingajkin@xored.com>

* Fix 573

Signed-off-by: denis-tingajkin <denis.tingajkin@xored.com>

* fix typo

Signed-off-by: denis-tingajkin <denis.tingajkin@xored.com>
Signed-off-by: Sergey Ershov <sergey.ershov@xored.com>

pkg/networkservice/common/filtermechanisms/server.go

@@ -21,6 +21,8 @@ package filtermechanisms
 import (
 	"context"
 
+	"github.com/networkservicemesh/sdk/pkg/registry/common/interpose"
+
 	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
 
 	"github.com/golang/protobuf/ptypes/empty"
@@ -33,30 +35,22 @@ import (
 )
 
 type filterMechanismsServer struct {
-	urls           endpointurls.Set
-	localThreshold int
+	nses endpointurls.Map
 }
 
 // NewServer - filters out remote mechanisms if connection is received from a unix file socket, otherwise filters
-// out local mechanisms.
-func NewServer(registryServer *registry.NetworkServiceEndpointRegistryServer, options ...Option) networkservice.NetworkServiceServer {
-	result := &filterMechanismsServer{
-		localThreshold: defaultThreshold,
-	}
-	for _, applyOption := range options {
-		applyOption(result)
-	}
-	*registryServer = endpointurls.NewNetworkServiceEndpointRegistryServer(&result.urls)
+// out local mechanisms
+func NewServer(registryServer *registry.NetworkServiceEndpointRegistryServer) networkservice.NetworkServiceServer {
+	result := &filterMechanismsServer{}
+	*registryServer = endpointurls.NewNetworkServiceEndpointRegistryServer(&result.nses)
 	return result
 }
 
 func (f *filterMechanismsServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
 	u := clienturlctx.ClientURL(ctx)
-
-	if _, ok := f.urls.Load(*u); ok {
-		filteredMechanisms := filterMechanismsByCls(request.GetMechanismPreferences(), cls.LOCAL)
-		if len(filteredMechanisms) > 0 {
-			request.MechanismPreferences = filteredMechanisms
+	if name, ok := f.nses.Load(*u); ok {
+		if !interpose.Is(name) {
+			request.MechanismPreferences = filterMechanismsByCls(request.GetMechanismPreferences(), cls.LOCAL)
 		}
 	} else {
 		request.MechanismPreferences = filterMechanismsByCls(request.GetMechanismPreferences(), cls.REMOTE)

pkg/networkservice/common/filtermechanisms/server_test.go

@@ -21,8 +21,6 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"
 	"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
@@ -36,72 +34,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
 )
 
-func TestFilterMechanisms_RemoteExternal(t *testing.T) {
-	request := &networkservice.NetworkServiceRequest{
-		MechanismPreferences: []*networkservice.Mechanism{
-			{
-				Cls:  cls.REMOTE,
-				Type: vxlan.MECHANISM,
-			},
-			{
-				Cls:  cls.LOCAL,
-				Type: kernel.MECHANISM,
-			},
-		},
-		Connection: &networkservice.Connection{
-			Path: &networkservice.Path{
-				PathSegments: make([]*networkservice.PathSegment, 3),
-			},
-		},
-	}
-
-	var localRegistryServer registry.NetworkServiceEndpointRegistryServer
-	localServer := filtermechanisms.NewServer(&localRegistryServer)
-	var remoteRegistryServer registry.NetworkServiceEndpointRegistryServer
-	remoteServer := filtermechanisms.NewServer(&remoteRegistryServer, filtermechanisms.WithExternalThreshold())
-	u := &url.URL{Path: "test"}
-	_, _ = remoteRegistryServer.Register(context.Background(), &registry.NetworkServiceEndpoint{
-		Url: u.String(),
-	})
-	_, err := next.NewNetworkServiceServer(localServer, remoteServer).Request(clienturlctx.WithClientURL(context.Background(), u), request)
-	require.NoError(t, err)
-	require.Len(t, request.MechanismPreferences, 1)
-	require.Equal(t, cls.REMOTE, request.MechanismPreferences[0].Cls)
-}
-
-func TestFilterMechanisms_Remote(t *testing.T) {
-	request := &networkservice.NetworkServiceRequest{
-		MechanismPreferences: []*networkservice.Mechanism{
-			{
-				Cls:  cls.REMOTE,
-				Type: vxlan.MECHANISM,
-			},
-			{
-				Cls:  cls.LOCAL,
-				Type: kernel.MECHANISM,
-			},
-		},
-		Connection: &networkservice.Connection{
-			Path: &networkservice.Path{
-				PathSegments: make([]*networkservice.PathSegment, 5),
-			},
-		},
-	}
-
-	var localRegistryServer registry.NetworkServiceEndpointRegistryServer
-	localServer := filtermechanisms.NewServer(&localRegistryServer)
-	var remoteRegistryServer registry.NetworkServiceEndpointRegistryServer
-	remoteServer := filtermechanisms.NewServer(&remoteRegistryServer)
-	u := &url.URL{Path: "test"}
-	_, _ = remoteRegistryServer.Register(context.Background(), &registry.NetworkServiceEndpoint{
-		Url: u.String(),
-	})
-	_, err := next.NewNetworkServiceServer(localServer, remoteServer).Request(clienturlctx.WithClientURL(context.Background(), u), request)
-	require.NoError(t, err)
-	require.Len(t, request.MechanismPreferences, 1)
-	require.Equal(t, cls.REMOTE, request.MechanismPreferences[0].Cls)
-}
-
 func TestFilterMechanismsServer_Request(t *testing.T) {
 	request := func() *networkservice.NetworkServiceRequest {
 		return &networkservice.NetworkServiceRequest{