From e7106b932133ec5f14ca4be8798bb4c42b611eda Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Mon, 24 Jul 2023 20:11:26 +0400 Subject: [PATCH 1/2] Update vpphelper link Signed-off-by: Ivan Osipov --- go.mod | 2 +- go.sum | 4 ++-- main.go | 3 ++- pkg/networkservice/ifconfig/server.go | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9af8e0e..1885aae 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.20 require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/grpcfd v1.1.2 - github.com/edwarnicke/vpphelper v0.2.0 github.com/golang/protobuf v1.5.3 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.9.1-0.20230627143611-9785eacf9687 @@ -13,6 +12,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20230713084322-eaf1d25c7512 github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f + github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index 5da78d2..7bc131c 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,6 @@ github.com/edwarnicke/log v1.0.0/go.mod h1:eWsQQlQ0IU5wHlJvyXFH3dS8s2g9GzN7JnXod github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw= github.com/edwarnicke/serialize v1.0.7 h1:geX8vmyu8Ij2S5fFIXjy9gBDkKxXnrMIzMoDvV0Ddac= github.com/edwarnicke/serialize v1.0.7/go.mod h1:y79KgU2P7ALH/4j37uTSIdNavHFNttqN7pzO6Y8B2aw= -github.com/edwarnicke/vpphelper v0.2.0 h1:Ra47QFtmR/Ji8czoRBwD/pboLfK1GiQEI1SSrsaYupE= -github.com/edwarnicke/vpphelper v0.2.0/go.mod h1:2KXgJqOUUCh9S4Zs2jAycQLqAcRGge3q+GXV2rN55ZQ= 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= @@ -225,6 +223,8 @@ github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e h1:+U github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e/go.mod h1:bPYkChhH8tFl5FcT9OicRD3h9IhCpXnNcyjvrzIDiuE= github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f h1:cH63QoV++p/cUtj79O6vUhvM2yNMcUVxwcf5tQ3qzcc= github.com/networkservicemesh/sdk-vpp v0.0.0-20230714110741-f407de38212f/go.mod h1:zagGyM1t5zT9qvx6cN6z4ldK/boXQxZDr4zUx3Y5OfM= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972 h1:Qu4LsLjAM/qVkVvIw1pvNHLkOnN4/6n79LHM2FVl/xw= +github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972/go.mod h1:sRkqSd8psiUrUvKjCiDHvNcOXzOsxJkAxU5UkKmQy4M= 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= diff --git a/main.go b/main.go index 506e5dc..758fda0 100644 --- a/main.go +++ b/main.go @@ -39,7 +39,6 @@ import ( nested "github.com/antonfisher/nested-logrus-formatter" "github.com/edwarnicke/grpcfd" - "github.com/edwarnicke/vpphelper" "github.com/kelseyhightower/envconfig" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -49,6 +48,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/networkservicemesh/vpphelper" + "github.com/networkservicemesh/api/pkg/api/networkservice" kernelmech "github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel" registryapi "github.com/networkservicemesh/api/pkg/api/registry" diff --git a/pkg/networkservice/ifconfig/server.go b/pkg/networkservice/ifconfig/server.go index 1ad938b..400252a 100644 --- a/pkg/networkservice/ifconfig/server.go +++ b/pkg/networkservice/ifconfig/server.go @@ -27,11 +27,12 @@ import ( "net" "sync" - "github.com/edwarnicke/vpphelper" "github.com/golang/protobuf/ptypes/empty" "github.com/pkg/errors" "github.com/vishvananda/netlink" + "github.com/networkservicemesh/vpphelper" + "github.com/networkservicemesh/govpp/binapi/af_packet" "github.com/networkservicemesh/govpp/binapi/fib_types" interfaces "github.com/networkservicemesh/govpp/binapi/interface" From bb97eb8921ce01e78997e8c24e48f866ccc0ab1b Mon Sep 17 00:00:00 2001 From: Ivan Osipov Date: Tue, 25 Jul 2023 15:26:41 +0400 Subject: [PATCH 2/2] Update CI settings Signed-off-by: Ivan Osipov --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 30a92e2..948ee6d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,7 +40,7 @@ jobs: restrictNSMDeps: uses: networkservicemesh/.github/.github/workflows/restrict-nsm-deps.yaml@main with: - allowed_repositories: "sdk, api, sdk-vpp, sdk-sriov, govpp" + allowed_repositories: "sdk, api, sdk-vpp, sdk-sriov, govpp, vpphelper" checkgomod: uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main