Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use networkservicemesh/govpp #884

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Use networkservicemesh/govpp #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
restrictNSMDeps:
uses: networkservicemesh/.github/.github/workflows/restrict-nsm-deps.yaml@main
with:
allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp"
allowed_repositories: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp, govpp"

checkgomod:
uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VPP_VERSION=v23.02-rc0-189-g0359d19f2
FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as go
ARG VPP_VERSION=v23.02-rc0-189-g766031bdb
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go
COPY --from=golang:1.18.2-buster /usr/local/go/ /go
ENV PATH ${PATH}:/go/bin
ENV GO111MODULE=on
Expand Down Expand Up @@ -31,7 +31,7 @@ FROM test as debug
WORKDIR /build/internal/tests/
CMD dlv -l :40000 --headless=true --api-version=2 test -test.v .

FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as runtime
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as runtime
RUN apt-get update
RUN apt install -f -y libbpf-dev
COPY --from=build /bin/forwarder /bin/forwarder
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ require (
github.com/edwarnicke/debug v1.0.0
github.com/edwarnicke/exechelper v1.0.3
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29
github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0
github.com/edwarnicke/grpcfd v1.1.2
github.com/edwarnicke/vpphelper v0.2.0
github.com/go-ping/ping v1.0.0
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.2.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b
github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e
github.com/networkservicemesh/sdk-k8s v0.0.0-20230621094605-79ca8a65f50c
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3
github.com/pkg/errors v0.9.1
github.com/safchain/ethtool v0.3.0
github.com/sirupsen/logrus v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ github.com/edwarnicke/exechelper v1.0.3 h1:OY2ocGAITTqnEDvZk0dRQSeMIQvyH0SyL/4nc
github.com/edwarnicke/exechelper v1.0.3/go.mod h1:R65OUPKns4bgeHkCmfSHbmqLBU8aHZxTgLmEyUBUk4U=
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 h1:4/2wgileNvQB4HfJbq7u4FFLKIfc38a6P0S/51ZGgX8=
github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29/go.mod h1:3m+ZfVq+z0pTLW798jmqnifMsalrVLIKmfXaMFvqSuc=
github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0 h1:3qXBk0lN7PhPrS/2TVJE30TZA/Ecd6LwkFW4rBxxb2w=
github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0/go.mod h1:kHDnxA+SSNFeMEHz7xvhub1zvx4mOTRlWWRCay2n5NM=
github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k=
github.com/edwarnicke/grpcfd v1.1.2/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA=
github.com/edwarnicke/log v1.0.0 h1:T6uRNCmR99GTt/CpRr2Gz8eGW8fm0HMThDNGdNxPaGk=
Expand Down Expand Up @@ -237,6 +235,8 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKksXsXsnDsEo+Cfn43pdPfML024ad//QcdKfgXK4=
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b h1:5no/Hfw/UaLGDWN8deavInPomlzkWwxbGXoXNdeY0sc=
github.com/networkservicemesh/govpp v0.0.0-20230626092821-fc47696d971b/go.mod h1:akUChTiTQ93H2iVixGfUS3x0UMKuu1pzmcECwdwj6Rk=
github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e h1:Gd9eqXL8E7Pb+wHjdy96/b7goBH52g5uVLQy8kgdxmI=
github.com/networkservicemesh/sdk v0.5.1-0.20230620142740-a8c394e69c4e/go.mod h1:hmu0t7IxKa1v7Mj7Y3dQrcpRD0YtEyFE5vJorXRQT2A=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230621094605-79ca8a65f50c h1:tvO6BS4QlDapOqVGSGfev8QBj4aqU1zHB7EDO//+iPM=
Expand All @@ -245,8 +245,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230626100905-a23442dae686 h1:2
github.com/networkservicemesh/sdk-kernel v0.0.0-20230626100905-a23442dae686/go.mod h1:64qsHWOfmq3CcyTrAi8TTOQctr4RLhZjcOtGSIjErYE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6 h1:BxdUbJVtRQet0w6t4rj918YEIqiNXp7vyojSAPHQT64=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230620143514-7a5d4745f6c6/go.mod h1:Mvik77CM1A3Kt6zWkfxEAPHGOTIbm5WHT99Fvv39z6I=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295 h1:QSDPB+9RgcfXk4vb4Y8gqhXeH6eXfrbyiUqFMaSGlsg=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626101316-8199d4b43295/go.mod h1:5P4pS7qAR0r4KiIX/zusAI7iMyAZqGiKYUJ2in+wA24=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3 h1:sJ2KjvR/vyUM6CauecAtsLLEFBTVMFRUNtvq5h19mAU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230626125723-f7a0e989a2b3/go.mod h1:LATrRKLUwNCFV9qlXO72/bmsHj2fljJWgGlLK15VE+Y=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down
23 changes: 11 additions & 12 deletions internal/imports/imports_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions internal/tests/suite_combinatronics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
//
Expand All @@ -21,7 +21,6 @@ package tests

import (
"context"
"io/ioutil"
"net"
"net/url"
"os"
Expand Down Expand Up @@ -165,7 +164,7 @@ func (f *ForwarderTestSuite) TestCombinations() {
ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"test": t.Name()}))
networkserviceName := "ns" + t.Name()

tmpDir, err := ioutil.TempDir("", "nse")
tmpDir, err := os.MkdirTemp("", "nse")
f.Require().NoError(err)
defer func(tmpDir string) { _ = os.Remove(tmpDir) }(tmpDir)
nseURL := url.URL{Scheme: "unix", Path: filepath.Join(tmpDir, "listen.on")}
Expand Down
3 changes: 1 addition & 2 deletions internal/tests/suite_setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ package tests
import (
"context"
"fmt"
"io/ioutil"
"net"
"os"
"path/filepath"
Expand Down Expand Up @@ -206,7 +205,7 @@ func (f *ForwarderTestSuite) SetupSuite() {
func (f *ForwarderTestSuite) createVpp(ctx context.Context, name string) (vppConn vpphelper.Connection, vppRoot string, errCh <-chan error) {
now := time.Now()
var err error
vppRoot, err = ioutil.TempDir("", fmt.Sprintf("%s-", name))
vppRoot, err = os.MkdirTemp("", fmt.Sprintf("%s-", name))
f.Require().NoError(err)

f.Require().NoError(err)
Expand Down
9 changes: 5 additions & 4 deletions internal/vppinit/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ import (
"time"

"git.fd.io/govpp.git/api"
"github.com/edwarnicke/govpp/binapi/acl"
"github.com/edwarnicke/govpp/binapi/acl_types"
"github.com/edwarnicke/govpp/binapi/interface_types"
"github.com/edwarnicke/govpp/binapi/ip_types"
"github.com/pkg/errors"

"github.com/networkservicemesh/govpp/binapi/acl"
"github.com/networkservicemesh/govpp/binapi/acl_types"
"github.com/networkservicemesh/govpp/binapi/interface_types"
"github.com/networkservicemesh/govpp/binapi/ip_types"

"github.com/networkservicemesh/sdk-vpp/pkg/tools/types"
"github.com/networkservicemesh/sdk/pkg/tools/log"
)
Expand Down
7 changes: 5 additions & 2 deletions internal/vppinit/links.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Copyright (c) 2021-2022 Nordix Foundation.
//
// Copyright (c) 2023 Cisco and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -24,11 +26,12 @@ import (
"time"

"git.fd.io/govpp.git/api"
interfaces "github.com/edwarnicke/govpp/binapi/interface"
"github.com/edwarnicke/govpp/binapi/interface_types"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"

interfaces "github.com/networkservicemesh/govpp/binapi/interface"
"github.com/networkservicemesh/govpp/binapi/interface_types"

"github.com/networkservicemesh/sdk/pkg/tools/log"
)

Expand Down
17 changes: 9 additions & 8 deletions internal/vppinit/vppinit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,18 @@ import (
"github.com/safchain/ethtool"

"git.fd.io/govpp.git/api"
"github.com/edwarnicke/govpp/binapi/af_packet"
"github.com/edwarnicke/govpp/binapi/af_xdp"
"github.com/edwarnicke/govpp/binapi/fib_types"
interfaces "github.com/edwarnicke/govpp/binapi/interface"
"github.com/edwarnicke/govpp/binapi/interface_types"
"github.com/edwarnicke/govpp/binapi/ip"
"github.com/edwarnicke/govpp/binapi/ip6_nd"
"github.com/edwarnicke/govpp/binapi/ip_neighbor"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"

"github.com/networkservicemesh/govpp/binapi/af_packet"
"github.com/networkservicemesh/govpp/binapi/af_xdp"
"github.com/networkservicemesh/govpp/binapi/fib_types"
interfaces "github.com/networkservicemesh/govpp/binapi/interface"
"github.com/networkservicemesh/govpp/binapi/interface_types"
"github.com/networkservicemesh/govpp/binapi/ip"
"github.com/networkservicemesh/govpp/binapi/ip6_nd"
"github.com/networkservicemesh/govpp/binapi/ip_neighbor"

"github.com/networkservicemesh/sdk-vpp/pkg/tools/types"
"github.com/networkservicemesh/sdk/pkg/tools/log"
)
Expand Down