From dc58042f9bdc9bb338213536aa8bcde35ae5621d Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 13 Oct 2021 17:19:06 -0500 Subject: [PATCH] Adapt to networkservicemesh/sdk#1083 Signed-off-by: Ed Warnicke --- go.mod | 4 ++-- go.sum | 3 +++ pkg/networkservice/chains/xconnectns/server.go | 14 +++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 199701e3..56dee957 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/golang/protobuf v1.4.3 github.com/google/uuid v1.2.0 github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e - github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d - github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac + github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125 + github.com/networkservicemesh/sdk-kernel v0.0.0-20211013215511-d34038567c92 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.0 go.uber.org/goleak v1.1.10 diff --git a/go.sum b/go.sum index 0124220d..81d4aad6 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,11 @@ github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e h1:PO6tDo github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d h1:x45/M58BggOOrFa5dCVn+xS80lPdoNO29UDQbrooSOA= github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc= +github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc= github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac h1:eVg90XP83nYCzlqY2CFznm1OtCb3FS5wFjoRmzfgE9U= github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac/go.mod h1:4le9X2gv+aPVVYkfq9c0pCFuKsEMKkC3wzNDVP+sfZM= +github.com/networkservicemesh/sdk-kernel v0.0.0-20211013215511-d34038567c92 h1:F+ND3jjmfZXFqMXFdTR2tmmM+ujh1xR6ly+Ic2uPP3A= +github.com/networkservicemesh/sdk-kernel v0.0.0-20211013215511-d34038567c92/go.mod h1:2lOVhi2xPDhi7DxPI1ryj90pmWD/b/oi9PuMXne/Kac= 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/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= diff --git a/pkg/networkservice/chains/xconnectns/server.go b/pkg/networkservice/chains/xconnectns/server.go index ec6394c7..56d0a9d9 100644 --- a/pkg/networkservice/chains/xconnectns/server.go +++ b/pkg/networkservice/chains/xconnectns/server.go @@ -39,16 +39,13 @@ import ( "github.com/networkservicemesh/sdk/pkg/networkservice/chains/endpoint" "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/mechanismtranslation" "github.com/networkservicemesh/sdk/pkg/networkservice/common/null" "github.com/networkservicemesh/sdk/pkg/networkservice/common/switchcase" - "github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters" "github.com/networkservicemesh/sdk/pkg/networkservice/core/chain" "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-sriov/pkg/networkservice/common/mechanisms/noop" @@ -117,18 +114,17 @@ func NewServer( }, ), clienturl.NewServer(clientURL), - heal.NewServer(ctx, - heal.WithOnHeal(addressof.NetworkServiceClient(adapters.NewServerToClient(rv))), - heal.WithOnRestore(heal.OnRestoreIgnore)), - connect.NewServer(ctx, - client.NewClientFactory( + connect.NewServer( + client.NewClient( + ctx, client.WithName(name), client.WithAdditionalFunctionality( mechanismtranslation.NewClient(), noop.NewClient(), ), + client.WithDialOptions(clientDialOptions...), + client.WithoutRefresh(), ), - connect.WithDialOptions(clientDialOptions...), ), }