Merge pull request #409 from glazychev-art/registry_upd

Update registry client
networkservicemesh · May 12, 2022 · d007eaa · d007eaa
2 parents 50b8198 + 1a3d6e8
commit d007eaa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.2.0
 	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
 	go.uber.org/goleak v1.1.12

diff --git a/go.sum b/go.sum
@@ -99,10 +99,10 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 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/open-policy-agent/opa v0.16.1 h1:BDADmi1Xl08aPcubaYgSEU0lJ/zrWDwmFMRXVPX856c=
 github.com/open-policy-agent/opa v0.16.1/go.mod h1:P0xUE/GQAAgnvV537GzA0Ikw4+icPELRT327QJPkaKY=

diff --git a/pkg/networkservice/chains/forwarder/server.go b/pkg/networkservice/chains/forwarder/server.go
@@ -94,14 +94,17 @@ func NewServer(
 	dialTimeout time.Duration,
 	clientDialOptions ...grpc.DialOption,
 ) endpoint.Endpoint {
-	nseClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx, clientURL,
+	nseClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx,
+		registryclient.WithClientURL(clientURL),
 		registryclient.WithNSEAdditionalFunctionality(
 			registryrecvfd.NewNetworkServiceEndpointRegistryClient(),
 			registrysendfd.NewNetworkServiceEndpointRegistryClient(),
 		),
 		registryclient.WithDialOptions(clientDialOptions...),
 	)
-	nsClient := registryclient.NewNetworkServiceRegistryClient(ctx, clientURL, registryclient.WithDialOptions(clientDialOptions...))
+	nsClient := registryclient.NewNetworkServiceRegistryClient(ctx,
+		registryclient.WithClientURL(clientURL),
+		registryclient.WithDialOptions(clientDialOptions...))
 
 	rv := new(sriovServer)