Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from update/networkservicemesh/sdk #136

Merged
merged 2 commits into from
Mar 24, 2021
Merged

Update from update/networkservicemesh/sdk #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27e1628
Update go.mod and go.sum to latest version from networkservicemesh/sd…
Mar 23, 2021
183223d
Fix heal update (#137)
Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/edwarnicke/govpp v0.0.0-20210225052125-79125273957c
github.com/golang/protobuf v1.4.3
github.com/hashicorp/go-multierror v1.0.0
github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700
github.com/networkservicemesh/sdk v0.0.0-20210322090132-801aa9713ef0
github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9
github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
github.com/thanhpk/randstr v1.0.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
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-20210322090132-801aa9713ef0 h1:wrDC/zHuIxmUbctxoH2eZmsebZLZ9xSt46PKLMEmxCs=
github.com/networkservicemesh/sdk v0.0.0-20210322090132-801aa9713ef0/go.mod h1:+LVOGPLY1FYgFW+ROUR5jxq/9pUl8NDSbq/8xyoUqxA=
github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9 h1:fthzwqhZV4wvTe0YHK2ZS6pTsOUETMWsLhVC16PRtaE=
github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74 h1:wjNgZqAQTQ5p+MS/D30rhXOzrc8lISaA7vmijZMjPFg=
github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74/go.mod h1:Pz5dfF3iV3JaW1QwtTeZyU/s8Jd14lcgG4s9O9xDGnQ=
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=
Expand Down
3 changes: 2 additions & 1 deletion pkg/networkservice/chains/xconnectns/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ 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/mechanisms/sendfd"
Expand Down Expand Up @@ -69,13 +70,13 @@ func NewServer(ctx context.Context, name string, authzServer networkservice.Netw
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))),
connect.NewServer(
ctx,
func(ctx context.Context, cc grpc.ClientConnInterface) networkservice.NetworkServiceClient {
return client.NewClient(ctx,
cc,
client.WithName(name),
client.WithHeal(addressof.NetworkServiceClient(adapters.NewServerToClient(rv))),
client.WithAdditionalFunctionality(
mechanismtranslation.NewClient(),
connectioncontextkernel.NewClient(),
Expand Down