Assign payload from network service to the connection (#791)

Signed-off-by: Artem Belov <artem.belov@xored.com>
networkservicemesh · Mar 25, 2021 · 8fe930c · 8fe930c
1 parent a9754c7
commit 8fe930c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/networkservice/common/discover/server.go b/pkg/networkservice/common/discover/server.go
@@ -69,6 +69,8 @@ func (d *discoverCandidatesServer) Request(ctx context.Context, request *network
 		return nil, err
 	}
 
+	request.GetConnection().Payload = ns.Payload
+
 	delay := defaultDiscoverDelay
 	for ctx.Err() == nil {
 		resp, err := next.Server(ctx).Request(WithCandidates(ctx, nses, ns), request)

diff --git a/pkg/networkservice/common/discover/server_test.go b/pkg/networkservice/common/discover/server_test.go
@@ -416,7 +416,8 @@ func TestMatchExactService(t *testing.T) {
 
 	// 3. Register NS, NSE with the right name
 	_, err = nsServer.Register(context.Background(), &registry.NetworkService{
-		Name: nsName,
+		Name:    nsName,
+		Payload: payload.IP,
 	})
 	require.NoError(t, err)
 	_, err = nseServer.Register(context.Background(), &registry.NetworkServiceEndpoint{
@@ -428,8 +429,9 @@ func TestMatchExactService(t *testing.T) {
 	ctx, cancel = context.WithTimeout(context.Background(), 10*time.Millisecond)
 	defer cancel()
 
-	_, err = server.Request(ctx, request.Clone())
+	conn, err := server.Request(ctx, request.Clone())
 	require.NoError(t, err)
+	require.Equal(t, payload.IP, conn.Payload)
 }
 
 func TestMatchExactEndpoint(t *testing.T) {