From c2f6ffacba32f1cb203c67f50096568acaf84ab8 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 9 Nov 2021 20:14:41 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/437 Commit: 69600f5 Author: Denis Tingaikin Date: 2021-11-09 23:14:04 +0300 Message: - remove clienturl from chains/forwarder (#437) 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 e56be045..3a601c03 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20211108225443-65796945d24d github.com/networkservicemesh/sdk-k8s v0.0.0-20211103091718-33b5af79cf03 github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6 - github.com/networkservicemesh/sdk-vpp v0.0.0-20211108235351-e35775c814d4 + github.com/networkservicemesh/sdk-vpp v0.0.0-20211109201404-69600f514dac github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.7.0 github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2 diff --git a/go.sum b/go.sum index 8eae57d5..fc6449d1 100644 --- a/go.sum +++ b/go.sum @@ -358,8 +358,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20211108225859-2db0822a1c14 h1:t github.com/networkservicemesh/sdk-kernel v0.0.0-20211108225859-2db0822a1c14/go.mod h1:u7vQCgUUT0DzW0xVFadc8p8ItGmgDB5Ho2qke3ewdnQ= github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6 h1:WsnwJeTDbTVJc8FuCYIUt6y9QnYaRrEyH3TCycQGDRo= github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6/go.mod h1:Sx4W7rd93sUhpCPT92FvhDXAbbfshVcB4IX4CgTrFos= -github.com/networkservicemesh/sdk-vpp v0.0.0-20211108235351-e35775c814d4 h1:eb2HFbut/ax4x1JkpKvg+2q8EWOrMh+2AIArXaCw1Oc= -github.com/networkservicemesh/sdk-vpp v0.0.0-20211108235351-e35775c814d4/go.mod h1:ypHVrxveXzME4bHL61nwwRXUPfwWL0vNQT6/yMI9J3w= +github.com/networkservicemesh/sdk-vpp v0.0.0-20211109201404-69600f514dac h1:ZoHmmNuYVEp4Qm1O7ctaZQJp5euzxT7MWR4vxtLZKag= +github.com/networkservicemesh/sdk-vpp v0.0.0-20211109201404-69600f514dac/go.mod h1:ypHVrxveXzME4bHL61nwwRXUPfwWL0vNQT6/yMI9J3w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From 21a52aabe42278b3676071d10213623604e2f743 Mon Sep 17 00:00:00 2001 From: denis-tingaikin Date: Tue, 9 Nov 2021 23:27:43 +0300 Subject: [PATCH 2/2] apply fixes for latest sdk-vpp Signed-off-by: denis-tingaikin --- internal/tests/suite_combinatronics_test.go | 2 +- internal/tests/suite_setup_test.go | 1 - internal/tests/suite_test.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/tests/suite_combinatronics_test.go b/internal/tests/suite_combinatronics_test.go index 76f9c5cd..b854a9c7 100644 --- a/internal/tests/suite_combinatronics_test.go +++ b/internal/tests/suite_combinatronics_test.go @@ -138,7 +138,7 @@ func (f *ForwarderTestSuite) TestCombinations() { _, err = adapters.NetworkServiceEndpointServerToClient(f.registryServer).Register(ctx, ®istry.NetworkServiceEndpoint{ Name: "nse", NetworkServiceNames: []string{"ns"}, - Url: f.listenOn, + Url: f.config.ConnectTo.String(), }) f.Require().NoError(err) diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go index 9839f11f..30e2f10a 100644 --- a/internal/tests/suite_setup_test.go +++ b/internal/tests/suite_setup_test.go @@ -166,7 +166,6 @@ func (f *ForwarderTestSuite) SetupSuite() { f.Require().NoError(err) log.FromContext(ctx).Infof("Received regEndpoint: %+v (time since start: %s)", regEndpoint, time.Since(starttime)) - f.listenOn = regEndpoint.GetNetworkServiceEndpoint().GetUrl() // ******************************************************************************** log.FromContext(f.ctx).Infof("Creating grpc.ClientConn to SUT (time since start: %s)", time.Since(starttime)) // ******************************************************************************** diff --git a/internal/tests/suite_test.go b/internal/tests/suite_test.go index 13028e88..85fa3b1c 100644 --- a/internal/tests/suite_test.go +++ b/internal/tests/suite_test.go @@ -46,7 +46,6 @@ type ForwarderTestSuite struct { spireErrCh <-chan error x509source x509svid.Source x509bundle x509bundle.Source - listenOn string // vppServer stuff vppServerConn vpphelper.Connection