From 4ad6f8fb0dd7a2922be34ecb58fed10c10023a03 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 5 Feb 2024 11:04:40 +0000 Subject: [PATCH 1/3] Update go.mod and go.sum to latest version from networkservicemesh/sdk@main PR link: https://github.com/networkservicemesh/sdk/pull/1582 Commit: f37b863 Author: Denis Tingaikin Date: 2024-02-05 14:03:52 +0300 Message: - qfix: Do not reset IPContext configuration on the reselect (#1582) * do not reset IPContext configuration on the reselect Signed-off-by: denis-tingaikin * fix linter issues Signed-off-by: denis-tingaikin --------- Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9bac593..331e9fc 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/golang/protobuf v1.5.3 github.com/google/uuid v1.3.1 github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985 - github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560 + github.com/networkservicemesh/sdk v0.5.1-0.20240205110352-f37b863ccb82 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index df9215b..15c6a79 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985 h1:uiWxBSamqODTzO/uobmjjqWAhi93+bpIDQ+OpV3uU58= github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985/go.mod h1:E2yBac48+mMkMh6ODnsNyah4EE6rI08SMR9n+86Emxs= -github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560 h1:8Hl4Rsk/So63EqPs8mY3BmeakRDrPKWHQWH+fWPhPl8= -github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc= +github.com/networkservicemesh/sdk v0.5.1-0.20240205110352-f37b863ccb82 h1:w7bFMDW09dbu0sG3i83PlP5hVzA3wyVk2//qrtUfm0w= +github.com/networkservicemesh/sdk v0.5.1-0.20240205110352-f37b863ccb82/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc= github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk= From 134d934d6158c81e033ffb64772bee8cfd1a2278 Mon Sep 17 00:00:00 2001 From: denis-tingaikin Date: Fri, 9 Feb 2024 12:00:51 +0300 Subject: [PATCH 2/3] fix:Test_ReselectEndpointWhenNetSvcHasChanged doesn't work with latest changes from sdk Signed-off-by: denis-tingaikin --- pkg/registry/chains/registryk8s/registry-k8s_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/registry/chains/registryk8s/registry-k8s_test.go b/pkg/registry/chains/registryk8s/registry-k8s_test.go index 0088688..4b263f7 100644 --- a/pkg/registry/chains/registryk8s/registry-k8s_test.go +++ b/pkg/registry/chains/registryk8s/registry-k8s_test.go @@ -40,6 +40,7 @@ import ( "github.com/networkservicemesh/sdk/pkg/networkservice/chains/client" "github.com/networkservicemesh/sdk/pkg/networkservice/chains/endpoint" "github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam" + "github.com/networkservicemesh/sdk/pkg/networkservice/ipam/strictipam" "github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkresponse" registryserver "github.com/networkservicemesh/sdk/pkg/registry" registryclient "github.com/networkservicemesh/sdk/pkg/registry/chains/client" @@ -118,7 +119,7 @@ func Test_ReselectEndpointWhenNetSvcHasChanged(t *testing.T) { serv := grpc.NewServer() endpoint.NewServer(ctx, sandbox.GenerateTestToken, endpoint.WithAdditionalFunctionality( - point2pointipam.NewServer(ipNet), + strictipam.NewServer(point2pointipam.NewServer, ipNet), )).Register(serv) _ = serv.Serve(netListener) }() From 4d17e86771af00f41b009b85f681e6cfa23350ec Mon Sep 17 00:00:00 2001 From: denis-tingaikin Date: Fri, 9 Feb 2024 12:06:52 +0300 Subject: [PATCH 3/3] fix linter Signed-off-by: denis-tingaikin --- pkg/registry/chains/registryk8s/registry-k8s_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/registry/chains/registryk8s/registry-k8s_test.go b/pkg/registry/chains/registryk8s/registry-k8s_test.go index 4b263f7..2328fec 100644 --- a/pkg/registry/chains/registryk8s/registry-k8s_test.go +++ b/pkg/registry/chains/registryk8s/registry-k8s_test.go @@ -1,6 +1,6 @@ // Copyright (c) 2020-2021 Doc.ai and/or its affiliates. // -// Copyright (c) 2022-2023 Cisco and/or its affiliates. +// Copyright (c) 2022-2024 Cisco and/or its affiliates. // // SPDX-License-Identifier: Apache-2.0 //