From 136cfe1d9971a20f9a9b01e98354355d2e565167 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Wed, 26 Jan 2022 21:48:16 +0300 Subject: [PATCH 1/2] refactor nsmgr withregistry option Signed-off-by: Denis Tingaikin --- pkg/networkservice/chains/nsmgr/server.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/networkservice/chains/nsmgr/server.go b/pkg/networkservice/chains/nsmgr/server.go index 8e024e1b8..acb9cef26 100644 --- a/pkg/networkservice/chains/nsmgr/server.go +++ b/pkg/networkservice/chains/nsmgr/server.go @@ -78,7 +78,6 @@ type serverOptions struct { dialOptions []grpc.DialOption dialTimeout time.Duration regURL *url.URL - regDialOptions []grpc.DialOption name string url string forwarderServiceName string @@ -120,10 +119,9 @@ func WithAuthorizeServer(authorizeServer networkservice.NetworkServiceServer) Op } // WithRegistry sets URL and dial options to reach the upstream registry, if not passed memory storage will be used. -func WithRegistry(regURL *url.URL, regDialOptions ...grpc.DialOption) Option { +func WithRegistry(regURL *url.URL) Option { return func(o *serverOptions) { o.regURL = regURL - o.regDialOptions = regDialOptions } } From 07e0af7371898c5c400ba720e5f683161fd9d1e5 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Wed, 26 Jan 2022 21:53:34 +0300 Subject: [PATCH 2/2] fix tests Signed-off-by: Denis Tingaikin --- pkg/tools/sandbox/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tools/sandbox/node.go b/pkg/tools/sandbox/node.go index aa0ab681e..cb4455972 100644 --- a/pkg/tools/sandbox/node.go +++ b/pkg/tools/sandbox/node.go @@ -74,7 +74,7 @@ func (n *Node) NewNSMgr( } if n.domain.Registry != nil { - options = append(options, nsmgr.WithRegistry(CloneURL(n.domain.Registry.URL), dialOptions...)) + options = append(options, nsmgr.WithRegistry(CloneURL(n.domain.Registry.URL))) } if serveURL.Scheme != "unix" {