Merge pull request #36 from Tiberivs/pr-35

Update to latest sdk-vpp

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/edwarnicke/vpphelper v0.0.0-20210225052320-b4f1f1aff45d
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700
-	github.com/networkservicemesh/sdk v0.0.0-20210315062426-29f4f9c1a324
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20210315062820-2110a8c276fd
+	github.com/networkservicemesh/sdk v0.0.0-20210315171752-01cd1e0db8e4
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20210316111214-2e8a5c55af62
 	github.com/onsi/ginkgo v1.13.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.7.0

go.sum

@@ -155,10 +155,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRftaE+eac=
 github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700 h1:c4M5DLI0L3IMx56Gqnt6kQ4SAF0tRCu0thxH2gmTxCE=
 github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
-github.com/networkservicemesh/sdk v0.0.0-20210315062426-29f4f9c1a324 h1:JO4vaNVVZidEF+KGjapYMTKIjv3VUBQWOwKZKWjbliw=
-github.com/networkservicemesh/sdk v0.0.0-20210315062426-29f4f9c1a324/go.mod h1:hCOxrQcRgyiUtdzFp1RE775tQBW0Lexzcn7V5esSJxg=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20210315062820-2110a8c276fd h1:Pnwf+y7b2RB2KyWwxH7SiN55AC7BYaXUNo2AGws0aDI=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20210315062820-2110a8c276fd/go.mod h1:wUYFgwwq2jovr2+4689ZJa4VovHJ09sz5LPDE7o67Tw=
+github.com/networkservicemesh/sdk v0.0.0-20210315171752-01cd1e0db8e4 h1:+71uhZowTZop1AkbWRbaCKYsFX4Li8LUj67bm/FauO0=
+github.com/networkservicemesh/sdk v0.0.0-20210315171752-01cd1e0db8e4/go.mod h1:hCOxrQcRgyiUtdzFp1RE775tQBW0Lexzcn7V5esSJxg=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20210316111214-2e8a5c55af62 h1:lSOjlJnRw02LYo7ek3/jUe6yDjmY6CFoTvBi+oaiTEM=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20210316111214-2e8a5c55af62/go.mod h1:PJX9nkD1WAavReYxj3OBp+Y+JH1+T/ox2W+D/Tz4Itg=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=

main.go

@@ -162,23 +162,23 @@ func main() {
 	vppConn, vppErrCh := vpphelper.StartAndDialContext(ctx)
 	exitOnErr(ctx, cancel, vppErrCh)
 
-	responderEndpoint := endpoint.NewServer(
-		ctx,
-		config.Name,
-		authorize.NewServer(),
+	responderEndpoint := endpoint.NewServer(ctx,
 		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")