Skip to content

Commit

Permalink
Enable NSMgr restored test
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Belov <artem.belov@xored.com>
  • Loading branch information
Artem Belov committed Mar 9, 2021
1 parent ade908c commit a59fd48
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions pkg/networkservice/chains/nsmgr/server_heal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,6 @@ func testNSMGRHealForwarder(t *testing.T, nodeNum int, customConfig []*sandbox.N
}

func TestNSMGR_HealRemoteNSMgrRestored(t *testing.T) {
t.Skip("Depends on https://github.com/networkservicemesh/sdk/pull/703")

nsmgrCtx, nsmgrCtxCancel := context.WithTimeout(context.Background(), time.Second)
defer nsmgrCtxCancel()

Expand Down
4 changes: 2 additions & 2 deletions pkg/registry/common/localbypass/find_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

type localBypassNSEFindServer struct {
nseURLs *stringurl.Map
nsmgrUrl string
nsmgrURL string

registry.NetworkServiceEndpointRegistry_FindServer
}
Expand All @@ -35,7 +35,7 @@ func (s *localBypassNSEFindServer) Send(endpoint *registry.NetworkServiceEndpoin
if u, ok := s.nseURLs.Load(endpoint.Name); ok {
endpoint.Url = u.String()
}
if endpoint.Url == s.nsmgrUrl {
if endpoint.Url == s.nsmgrURL {
return errors.New("NSMgr found unregistered endpoint")
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/common/localbypass/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (s *localBypassNSEServer) Find(query *registry.NetworkServiceEndpointQuery,
func (s *localBypassNSEServer) findServer(server registry.NetworkServiceEndpointRegistry_FindServer) registry.NetworkServiceEndpointRegistry_FindServer {
return &localBypassNSEFindServer{
nseURLs: &s.nseURLs,
nsmgrUrl: s.url,
nsmgrURL: s.url,
NetworkServiceEndpointRegistry_FindServer: server,
}
}
Expand Down

0 comments on commit a59fd48

Please sign in to comment.