Make VXLAN port configurable

Issue: networkservicemesh#340

Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>

go.mod

@@ -12,8 +12,8 @@ require (
 	github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
 	github.com/networkservicemesh/sdk v0.5.1-0.20240319090455-a9e38d90df62
 	github.com/networkservicemesh/sdk-k8s v0.0.0-20240319090646-6f147030c854
-	github.com/networkservicemesh/sdk-ovs v0.0.0-20240212110616-e5da7f792803
-	github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a
+	github.com/networkservicemesh/sdk-ovs v0.0.0-20240319143704-12d73931586b
+	github.com/networkservicemesh/sdk-sriov v0.0.0-20240319091109-93b591c8e299
 	github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20210826171620-f06c53111a31
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
@@ -68,7 +68,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/networkservicemesh/sdk-kernel v0.0.0-20240212105448-f9f740175836 // indirect
+	github.com/networkservicemesh/sdk-kernel v0.0.0-20240319090539-7a9f71dfaa22 // indirect
 	github.com/open-policy-agent/opa v0.44.0 // indirect
 	github.com/ovn-org/libovsdb v0.6.1-0.20210824154155-9cab5b210dce // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

go.sum

@@ -402,12 +402,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240319090455-a9e38d90df62 h1:jdPqrC
 github.com/networkservicemesh/sdk v0.5.1-0.20240319090455-a9e38d90df62/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20240319090646-6f147030c854 h1:XvJXPcn87ISCVgIQv2Nc+TqzkB6orweCrz9J1HPyk5Q=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20240319090646-6f147030c854/go.mod h1:YZH60Q9gBU0UK4VF/2ToiWpiwmIqeHyoq2zD8Xf7jBI=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20240212105448-f9f740175836 h1:izzgZmyDcgEElhNv4DbsKWoZ6mazueIlqLOvULq+t4k=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20240212105448-f9f740175836/go.mod h1:xvmFv1R0zlB1pNtjWCiw0y7df+/XITxtSGDhQj7jAEs=
-github.com/networkservicemesh/sdk-ovs v0.0.0-20240212110616-e5da7f792803 h1:37EW1eTTZUwldd3pZDuKY3km3Lc/PojfxmXF8MaajnU=
-github.com/networkservicemesh/sdk-ovs v0.0.0-20240212110616-e5da7f792803/go.mod h1:+Vb4mrXJGtHOXo2fitF/7kBqWstDHZaQqlXBxw9VcHU=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a h1:R9tmLBVm8c80OPxUZyGT1RdvBE3N2EXNd56bFcwAoE4=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a/go.mod h1:lTP/g0pAmkYW+RqVRiHdA0gylXD0hrTT0hXyzhi4iPY=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20240319090539-7a9f71dfaa22 h1:55hQN0gP8wptaXbPMwFmqMlK93aAoSkIqAPbcRUAzhg=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20240319090539-7a9f71dfaa22/go.mod h1:HKB68NO++qwrfEyUN8/YjwaLZcbqt1ZX/yAlm4XhKYs=
+github.com/networkservicemesh/sdk-ovs v0.0.0-20240319143704-12d73931586b h1:OCBHNJwlBqQQAkICO1Uv0cgRdR0WIzdLI84uKeUvdnI=
+github.com/networkservicemesh/sdk-ovs v0.0.0-20240319143704-12d73931586b/go.mod h1:JP9MVi/jfln5D5KBQqHukKznRm77lgGVGuFGeOqsPZw=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20240319091109-93b591c8e299 h1:0PAjNvCfu80Mo4BrztAdcr5G9zSM+mGbW8+nkT9zH8Q=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20240319091109-93b591c8e299/go.mod h1:GKmM0Fwc02OFHyvOOvPAyUD+M4766DvGUamw214saVk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=

main.go

@@ -1,6 +1,6 @@
-// Copyright (c) 2021-2023 Nordix Foundation.
+// Copyright (c) 2021-2024 Nordix Foundation.
 //
-// Copyright (c) 2023 Cisco Foundation.
+// Copyright (c) 2023-2024 Cisco Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -42,6 +42,7 @@ import (
 	k8sdeviceplugin "github.com/networkservicemesh/sdk-k8s/pkg/tools/deviceplugin"
 	k8spodresources "github.com/networkservicemesh/sdk-k8s/pkg/tools/podresources"
 	"github.com/networkservicemesh/sdk-ovs/pkg/networkservice/chains/forwarder"
+	"github.com/networkservicemesh/sdk-ovs/pkg/networkservice/mechanisms/vxlan"
 	ovsutil "github.com/networkservicemesh/sdk-ovs/pkg/tools/utils"
 	sriovconfig "github.com/networkservicemesh/sdk-sriov/pkg/sriov/config"
 	"github.com/networkservicemesh/sdk-sriov/pkg/sriov/pci"
@@ -81,6 +82,7 @@ type Config struct {
 	NSName                 string            `default:"forwarder" desc:"Name of Network Service to Register with Registry"`
 	BridgeName             string            `default:"br-nsm" desc:"Name of the OvS bridge"`
 	TunnelIP               string            `desc:"IP or CIDR to use for tunnels" split_words:"true"`
+	VxlanPort              uint16            `default:"0" desc:"VXLAN port to use" split_words:"true"`
 	ConnectTo              url.URL           `default:"unix:///connect.to.socket" desc:"url to connect to" split_words:"true"`
 	DialTimeout            time.Duration     `default:"50ms" desc:"Timeout for the dial the next endpoint" split_words:"true"`
 	MaxTokenLifetime       time.Duration     `default:"24h" desc:"maximum lifetime of tokens" split_words:"true"`
@@ -335,6 +337,17 @@ func createKernelInterposeEndpoint(ctx context.Context, config *Config, tlsConfi
 	egressTunnelIP net.IP, l2cMap map[string]*ovsutil.L2ConnectionPoint) (endpoint.Endpoint, error) {
 	var spiffeidmap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]]
 
+	dialOptions := append(
+		tracing.WithTracingDial(),
+		grpc.WithBlock(),
+		grpc.WithTransportCredentials(
+			grpcfd.TransportCredentials(credentials.NewTLS(tlsConfig))),
+		grpc.WithDefaultCallOptions(
+			grpc.WaitForReady(true),
+			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
+		),
+		grpcfd.WithChainStreamInterceptor(),
+		grpcfd.WithChainUnaryInterceptor())
 	return forwarder.NewKernelServer(
 		ctx,
 		config.Name,
@@ -346,14 +359,8 @@ func createKernelInterposeEndpoint(ctx context.Context, config *Config, tlsConfi
 		egressTunnelIP,
 		config.DialTimeout,
 		l2cMap,
-		grpc.WithBlock(),
-		grpc.WithTransportCredentials(
-			grpcfd.TransportCredentials(credentials.NewTLS(tlsConfig))),
-		grpc.WithDefaultCallOptions(
-			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
-		),
-		grpcfd.WithChainStreamInterceptor(),
-		grpcfd.WithChainUnaryInterceptor(),
+		forwarder.WithVxlanOptions(vxlan.WithPort(config.VxlanPort)),
+		forwarder.WithDialOptions(dialOptions...),
 	)
 }
 
@@ -391,6 +398,18 @@ func createSriovInterposeEndpoint(ctx context.Context, config *Config, tlsConfig
 
 	var spiffeidmap genericsync.Map[spiffeid.ID, *genericsync.Map[string, struct{}]]
 
+	dialOptions := append(
+		tracing.WithTracingDial(),
+		grpc.WithBlock(),
+		grpc.WithTransportCredentials(
+			grpcfd.TransportCredentials(credentials.NewTLS(tlsConfig))),
+		grpc.WithDefaultCallOptions(
+			grpc.WaitForReady(true),
+			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
+		),
+		grpcfd.WithChainStreamInterceptor(),
+		grpcfd.WithChainUnaryInterceptor())
+
 	return forwarder.NewSriovServer(
 		ctx,
 		config.Name,
@@ -405,14 +424,8 @@ func createSriovInterposeEndpoint(ctx context.Context, config *Config, tlsConfig
 		sriovConfig,
 		config.DialTimeout,
 		l2cMap,
-		grpc.WithBlock(),
-		grpc.WithTransportCredentials(
-			grpcfd.TransportCredentials(credentials.NewTLS(tlsConfig))),
-		grpc.WithDefaultCallOptions(
-			grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, config.MaxTokenLifetime))),
-		),
-		grpcfd.WithChainStreamInterceptor(),
-		grpcfd.WithChainUnaryInterceptor(),
+		forwarder.WithVxlanOptions(vxlan.WithPort(config.VxlanPort)),
+		forwarder.WithDialOptions(dialOptions...),
 	)
 }