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 registry client #580

Merged
merged 2 commits into from
May 12, 2022
Merged

Update registry client #580

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
14a499c
Update go.mod and go.sum to latest version from networkservicemesh/sd…
May 12, 2022
0924888
Update registry client
glazychev-art May 12, 2022
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 @@ -10,8 +10,8 @@ require (
github.com/google/uuid v1.1.2
github.com/hashicorp/go-multierror v1.1.1
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5
github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
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 @@ -121,10 +121,10 @@ github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCL
github.com/mna/pigeon v0.0.0-20180808201053-bb0192cfc2ae/go.mod h1:Iym28+kJVnC1hfQvv5MUtI6AiFFzvQjHcvI4RFTG/04=
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI=
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18 h1:gHQmGN6YFwGWkM7cxrUuB1BV2L0qvPkkyIl/Cq19gtw=
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5 h1:Ntnm27hxOVePlkdtPh/Xwhy3wuyXd84LqIQU1yS+dEY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg=
github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI=
github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0 h1:jA12434k3miWlCrT/IO9wmvlpvQqud8XtmNK/lcBJvQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0/go.mod h1:ajoJFtAjgQ/UyotcgIbAv3a+x/c5DW6KwuXaLdWxKsY=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
Expand Down
7 changes: 5 additions & 2 deletions pkg/networkservice/chains/forwarder/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,17 @@ func NewServer(ctx context.Context, tokenGenerator token.GeneratorFunc, vppConn
for _, opt := range options {
opt(opts)
}
nseClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx, opts.clientURL,
nseClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx,
registryclient.WithClientURL(opts.clientURL),
registryclient.WithNSEAdditionalFunctionality(
registryrecvfd.NewNetworkServiceEndpointRegistryClient(),
registrysendfd.NewNetworkServiceEndpointRegistryClient(),
),
registryclient.WithDialOptions(opts.dialOpts...),
)
nsClient := registryclient.NewNetworkServiceRegistryClient(ctx, opts.clientURL, registryclient.WithDialOptions(opts.dialOpts...))
nsClient := registryclient.NewNetworkServiceRegistryClient(ctx,
registryclient.WithClientURL(opts.clientURL),
registryclient.WithDialOptions(opts.dialOpts...))

rv := &xconnectNSServer{}
additionalFunctionality := []networkservice.NetworkServiceServer{
Expand Down