From c18dda0998d08f1186a4e15841d60cead5df8958 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Tue, 24 Nov 2020 19:55:13 -0600 Subject: [PATCH] Minor fix to timing to get better visiblity into latencies. Signed-off-by: Ed Warnicke --- go.mod | 3 +-- go.sum | 4 ++-- internal/tests/suite_setup_test.go | 10 ---------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 3479d3f1..2c1080fc 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,13 @@ 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 github.com/edwarnicke/grpcfd v0.0.0-20201107002751-f220aed0c5c8 github.com/edwarnicke/log v1.0.0 github.com/edwarnicke/signalctx v0.0.0-20201105214533-3a35840b3011 - github.com/edwarnicke/vpphelper v0.0.0-20201118000727-c5667bc2b1a4 + github.com/edwarnicke/vpphelper v0.0.0-20201125015206-ce96ab6dfb2e github.com/golang/protobuf v1.4.3 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v0.0.0-20201117093615-ae6039374f31 diff --git a/go.sum b/go.sum index 6a2d80c7..bafa139f 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,8 @@ github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf h1:/lViRfaDxK github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw= github.com/edwarnicke/signalctx v0.0.0-20201105214533-3a35840b3011 h1:rlA4xj11pzxP9w/qVP11qZkRN+7UfA8MiW6pPljW0CM= github.com/edwarnicke/signalctx v0.0.0-20201105214533-3a35840b3011/go.mod h1:Z9/3G9n/oPyXJzsF4ucVh8YOxTlTidDLqOeWlGV1JAw= -github.com/edwarnicke/vpphelper v0.0.0-20201118000727-c5667bc2b1a4 h1:L6VFi6sm9SC41ivN/wBSJ9Mw2pQRu8clmHAyD+48PNI= -github.com/edwarnicke/vpphelper v0.0.0-20201118000727-c5667bc2b1a4/go.mod h1:Vs6aWFIO9nTFhl0qsxEprx0iab0l5Swb5f6srxG2rLI= +github.com/edwarnicke/vpphelper v0.0.0-20201125015206-ce96ab6dfb2e h1:NEcbmS+Oo8ZRr/DdU0xQ/szhAYgPBYaJYQ2w+hGWlm0= +github.com/edwarnicke/vpphelper v0.0.0-20201125015206-ce96ab6dfb2e/go.mod h1:Vs6aWFIO9nTFhl0qsxEprx0iab0l5Swb5f6srxG2rLI= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go index 56d8081d..dcf85081 100644 --- a/internal/tests/suite_setup_test.go +++ b/internal/tests/suite_setup_test.go @@ -26,7 +26,6 @@ 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" @@ -179,15 +178,6 @@ 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 }