Update govpp (#924)

* Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: networkservicemesh/sdk-vpp#742 Commit: 8a9c97e Author: Artem Glazychev Date: 2023-09-04 15:23:10 +0700 Message: - Update govpp (#742) * Update go.mod and go.sum to latest version from networkservicemesh/govpp@main PR link: https://github.com/networkservicemesh/govpp/pull/ Commit: 614d6d6 Author: Denis Tingaikin Date: 2023-09-01 16:23:04 +0300 Message: - Merge pull request #12 from networkservicemesh/vpp_1765f01 Signed-off-by: NSMBot <[email protected]> * Update govpp Signed-off-by: Artem Glazychev <[email protected]> --------- Signed-off-by: NSMBot <[email protected]> Signed-off-by: Artem Glazychev <[email protected]> Signed-off-by: NSMBot <[email protected]> * Update govpp Signed-off-by: Artem Glazychev <[email protected]> --------- Signed-off-by: NSMBot <[email protected]> Signed-off-by: Artem Glazychev <[email protected]> Co-authored-by: NSMBot <[email protected]>
networkservicemesh · Sep 4, 2023 · 32e3c2e · 32e3c2e
1 parent 1b810ff
commit 32e3c2e
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 46 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-ARG VPP_VERSION=v23.02-rc0-189-gb53439efb
+ARG VPP_VERSION=v23.10-rc0-164-gac0994fc0
 FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go
 COPY --from=golang:1.20.5-buster /usr/local/go/ /go
 ENV PATH ${PATH}:/go/bin
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOBIN=/bin
 RUN rm -r /etc/vpp
-RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.21.0
 RUN go install github.com/grpc-ecosystem/[email protected]
 ADD https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz .
 RUN tar xzvf spire-1.2.2-linux-x86_64-glibc.tar.gz -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/networkservicemesh/cmd-forwarder-vpp
 go 1.20
 
 require (
-	git.fd.io/govpp.git v0.3.6-0.20210927044411-385ccc0d8ba9
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/edwarnicke/debug v1.0.0
 	github.com/edwarnicke/exechelper v1.0.3
@@ -13,13 +12,13 @@ require (
 	github.com/golang/protobuf v1.5.3
 	github.com/google/uuid v1.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/networkservicemesh/api v1.9.1-0.20230627143611-9785eacf9687
-	github.com/networkservicemesh/govpp v0.0.0-20230630105900-092690d52a97
-	github.com/networkservicemesh/sdk v0.5.1-0.20230801094133-aeae47c771a6
+	github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804
+	github.com/networkservicemesh/govpp v0.0.0-20230901132304-614d6d6fb8a6
+	github.com/networkservicemesh/sdk v0.5.1-0.20230828163119-f96fdf637a63
 	github.com/networkservicemesh/sdk-k8s v0.0.0-20230802052926-7e6b96695a1a
 	github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20230810003715-0633e49fc885
-	github.com/networkservicemesh/vpphelper v0.0.0-20230721092715-212fb5b09cc2
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20230904082310-8a9c97efea32
+	github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
 	github.com/pkg/errors v0.9.1
 	github.com/safchain/ethtool v0.3.0
 	github.com/sirupsen/logrus v1.9.0
@@ -28,6 +27,7 @@ require (
 	github.com/thanhpk/randstr v1.0.4
 	github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b
 	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
+	go.fd.io/govpp v0.8.0
 	golang.org/x/text v0.10.0
 	google.golang.org/grpc v1.55.0
 )
@@ -54,7 +54,7 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
-	github.com/networkservicemesh/sdk-kernel v0.0.0-20230801094449-a44938ecb60d // indirect
+	github.com/networkservicemesh/sdk-kernel v0.0.0-20230829144358-77e8a631e818 // indirect
 	github.com/open-policy-agent/opa v0.44.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go
diff --git a/internal/tests/suite_healthcheck_test.go b/internal/tests/suite_healthcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 Cisco and/or its affiliates.
+// Copyright (c) 2020-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/internal/tests/suite_memif_test.go b/internal/tests/suite_memif_test.go
@@ -25,9 +25,9 @@ import (
 	"strings"
 	"time"
 
-	"git.fd.io/govpp.git/api"
-	"git.fd.io/govpp.git/binapi/vpe"
 	"github.com/pkg/errors"
+	"go.fd.io/govpp/api"
+	"go.fd.io/govpp/binapi/vlib"
 
 	"github.com/networkservicemesh/vpphelper"
 
@@ -149,13 +149,13 @@ func pingVpp(ctx context.Context, vppConn api.Connection, ipaddress string) erro
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	pingCmd := &vpe.CliInband{
+	pingCmd := &vlib.CliInband{
 		Cmd: fmt.Sprintf("ping %s interval 0.1 repeat 1 verbose", ip.String()),
 	}
 
 	// Prime the pump, vpp doesn't arp until needed, and so the first ping will fail
 	now := time.Now()
-	pingRsp, err := vpe.NewServiceClient(vppConn).CliInband(ctx, pingCmd)
+	pingRsp, err := vlib.NewServiceClient(vppConn).CliInband(ctx, pingCmd)
 	if err != nil {
 		return errors.WithStack(err)
 	}
@@ -166,7 +166,7 @@ func pingVpp(ctx context.Context, vppConn api.Connection, ipaddress string) erro
 		WithField("duration", time.Since(now)).Debug("completed")
 
 	now = time.Now()
-	if pingRsp, err = vpe.NewServiceClient(vppConn).CliInband(ctx, pingCmd); err != nil {
+	if pingRsp, err = vlib.NewServiceClient(vppConn).CliInband(ctx, pingCmd); err != nil {
 		return errors.WithStack(err)
 	}
 	log.FromContext(ctx).

diff --git a/internal/tests/suite_setup_test.go b/internal/tests/suite_setup_test.go
@@ -26,13 +26,13 @@ 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"
 	"github.com/sirupsen/logrus"
 	"github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig"
 	"github.com/spiffe/go-spiffe/v2/workloadapi"
+	"go.fd.io/govpp/binapi/vpe"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 

diff --git a/internal/tests/suite_vxlan_test.go b/internal/tests/suite_vxlan_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"net"
 
-	"git.fd.io/govpp.git/api"
+	"go.fd.io/govpp/api"
 	"google.golang.org/grpc"
 
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/pinhole"

diff --git a/internal/vppinit/acl.go b/internal/vppinit/acl.go
@@ -21,8 +21,8 @@ import (
 	"net"
 	"time"
 
-	"git.fd.io/govpp.git/api"
 	"github.com/pkg/errors"
+	"go.fd.io/govpp/api"
 
 	"github.com/networkservicemesh/govpp/binapi/acl"
 	"github.com/networkservicemesh/govpp/binapi/acl_types"

diff --git a/internal/vppinit/links.go b/internal/vppinit/links.go
@@ -25,9 +25,9 @@ import (
 	"net"
 	"time"
 
-	"git.fd.io/govpp.git/api"
 	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
+	"go.fd.io/govpp/api"
 
 	interfaces "github.com/networkservicemesh/govpp/binapi/interface"
 	"github.com/networkservicemesh/govpp/binapi/interface_types"

diff --git a/internal/vppinit/vppinit.go b/internal/vppinit/vppinit.go
@@ -29,9 +29,9 @@ import (
 	"github.com/go-ping/ping"
 	"github.com/safchain/ethtool"
 
-	"git.fd.io/govpp.git/api"
 	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
+	"go.fd.io/govpp/api"
 
 	"github.com/networkservicemesh/govpp/binapi/af_packet"
 	"github.com/networkservicemesh/govpp/binapi/af_xdp"