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

Manually update to networkservicemesh/sdk#1083 #43

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Manually update to networkservicemesh/sdk#1083 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Mellanox/sriovnet v1.0.3-0.20210630121212-0453bd4b7fbc
github.com/golang/protobuf v1.5.2
github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e
github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d
github.com/networkservicemesh/sdk v0.5.1-0.20211013215105-e4c4722a5125
github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac
github.com/networkservicemesh/sdk-sriov v0.0.0-20211012210107-752d65c9889c
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20210826171620-f06c53111a31
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,9 @@ 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 v1.0.1-0.20210907194827-9a36433d7d6e h1:PO6tDo/bGLJqz1qiqCecht/HqMWCKunAds2U9Hvc0yM=
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 h1:Ugmr8FiRUnPX4XKvx46FfeDkPd5DmJb7VvZneBHNR+I=
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-sriov v0.0.0-20211012210107-752d65c9889c h1:+2HR7Dsnp2L8WgwAa5H7k9WPsPcVxj7DkzrR3g2h1iQ=
Expand Down
13 changes: 4 additions & 9 deletions pkg/networkservice/chains/xconnectns/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,14 @@ 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"
"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"
"google.golang.org/grpc"

Expand Down Expand Up @@ -94,9 +91,6 @@ func newEndPoint(ctx context.Context, name string, authzServer, resourcePoolServ
sendfd.NewServer(),
// Statically set the url we use to the unix file socket for the NSMgr
clienturl.NewServer(clientURL),
heal.NewServer(ctx,
heal.WithOnHeal(addressof.NetworkServiceClient(adapters.NewServerToClient(rv))),
heal.WithOnRestore(heal.OnRestoreIgnore)),
mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
kernelmech.MECHANISM: switchcase.NewServer(
&switchcase.ServerCase{
Expand All @@ -117,9 +111,11 @@ func newEndPoint(ctx context.Context, name string, authzServer, resourcePoolServ
}),
inject.NewServer(),
connectioncontextkernel.NewServer(),
connect.NewServer(ctx,
client.NewClientFactory(
connect.NewServer(
client.NewClient(ctx,
client.WithoutRefresh(),
client.WithName(name),
client.WithDialOptions(clientDialOptions...),
client.WithAdditionalFunctionality(
mechanismtranslation.NewClient(),
l2ovsconnect.NewClient(bridgeName),
Expand All @@ -133,7 +129,6 @@ func newEndPoint(ctx context.Context, name string, authzServer, resourcePoolServ
sendfd.NewClient(),
),
),
connect.WithDialOptions(clientDialOptions...),
),
}

Expand Down