From fe21ca11f542980daaae5fa40036875d5a0370e8 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sun, 22 Nov 2020 21:51:35 -0600 Subject: [PATCH] Minor fixes. (#3) Signed-off-by: Ed Warnicke --- go.mod | 3 ++- go.sum | 4 ++-- internal/tests/suite_setup_test.go | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b47a584f..f588d145 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/networkservicemesh/cmd-forwarder-vpp go 1.15 require ( + git.fd.io/govpp.git v0.3.6-0.20200903151113-c94a96227985 github.com/antonfisher/nested-logrus-formatter v1.3.0 github.com/edwarnicke/debug v1.0.0 github.com/edwarnicke/exechelper v1.0.3 @@ -14,7 +15,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v0.0.0-20201117093615-ae6039374f31 github.com/networkservicemesh/sdk v0.0.0-20201121234030-da125e0dc295 - github.com/networkservicemesh/sdk-vpp v0.0.0-20201122000759-e3c331e1a263 + github.com/networkservicemesh/sdk-vpp v0.0.0-20201123030619-00a892de24e1 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 1991f450..cbc0cf64 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/networkservicemesh/api v0.0.0-20201117093615-ae6039374f31 h1:z5a+28GC github.com/networkservicemesh/api v0.0.0-20201117093615-ae6039374f31/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI= github.com/networkservicemesh/sdk v0.0.0-20201121234030-da125e0dc295 h1:Bw129FLgo0EiXG/G+fn1dV5Dm4TvEry815tvfmsYTbI= github.com/networkservicemesh/sdk v0.0.0-20201121234030-da125e0dc295/go.mod h1:/31b39yg0LIs7ZoyVSNjKIMyolXOdYp7KruZeqtUbhg= -github.com/networkservicemesh/sdk-vpp v0.0.0-20201122000759-e3c331e1a263 h1:w0uTxQ0yqYVnMEYy8hAqHNIdvyLBWYCOic6p0BGK5xo= -github.com/networkservicemesh/sdk-vpp v0.0.0-20201122000759-e3c331e1a263/go.mod h1:GKx1+9Qt/VgIbCGuVej1uBZx9PC67/w+bumHn4K44z4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20201123030619-00a892de24e1 h1:rlP3XtBDcR3l5ieXELXXHue6jz3E3c3aL4GPQ7pMrA0= +github.com/networkservicemesh/sdk-vpp v0.0.0-20201123030619-00a892de24e1/go.mod h1:GKx1+9Qt/VgIbCGuVej1uBZx9PC67/w+bumHn4K44z4= 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/nishanths/exhaustive v0.0.0-20200811152831-6cf413ae40e0/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c= diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go index dcf85081..56d8081d 100644 --- a/internal/tests/suite_setup_test.go +++ b/internal/tests/suite_setup_test.go @@ -26,6 +26,7 @@ import ( "path/filepath" "time" + "git.fd.io/govpp.git/binapi/vpe" nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/exechelper" "github.com/edwarnicke/grpcfd" @@ -178,6 +179,15 @@ func (f *ForwarderTestSuite) createVpp(ctx context.Context, name string) (vppCon ) f.Require().Len(errCh, 0) log.Entry(ctx).WithField("duration", time.Since(now)).Infof("Launched vpp %q. Access with vppctl -s /tmp/%s/var/run/vpp/cli.sock", vppRoot, vppRoot) + + now = time.Now() + version, err := vpe.NewServiceClient(vppConn).ShowVersion(ctx, &vpe.ShowVersion{}) + f.Require().NoError(err) + log.Entry(ctx). + WithField("duration", time.Since(now)). + WithField("vppName", name). + WithField("version", version.Version).Info("complete") + return vppConn, vppRoot, errCh }