Skip to content

Commit

Permalink
gomod: use /v3 suffix
Browse files Browse the repository at this point in the history 
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
  • Loading branch information
@sknat
sknat committed Mar 21, 2023
1 parent 1439f6c commit f106b2f
Show file tree
Hide file tree
Showing 171 changed files with 467 additions and 467 deletions.
2 changes: 1 addition & 1 deletion calico-vpp-agent/cmd/api-proxy/felix-api-proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"time"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/sirupsen/logrus"
"gopkg.in/tomb.v2"
)
Expand Down
20 changes: 10 additions & 10 deletions calico-vpp-agent/cmd/calico_vpp_dataplane.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/connectivity"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/policy"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/prometheus"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/routing"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/services"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/policy"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/prometheus"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/routing"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/services"

"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions calico-vpp-agent/cmd/debug-state/debug-state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"flag"
"fmt"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
log "github.com/sirupsen/logrus"
)

Expand Down
18 changes: 9 additions & 9 deletions calico-vpp-agent/cni/cni_node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ import (
"github.com/projectcalico/calico/felix/config"
oldv3 "github.com/projectcalico/calico/libcalico-go/lib/apis/v3"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
agentConf "github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/connectivity"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/tests/mocks"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/tests/mocks/calico"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/binapi/vppapi/interface_types"
"github.com/projectcalico/vpp-dataplane/vpplink/binapi/vppapi/ip_types"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
agentConf "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/connectivity"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks/calico"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/binapi/vppapi/interface_types"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/binapi/vppapi/ip_types"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
24 changes: 12 additions & 12 deletions calico-vpp-agent/cni/cni_pod_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ import (
. "github.com/onsi/gomega"
gs "github.com/onsi/gomega/gstruct"
"github.com/projectcalico/calico/felix/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/pod_interface"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
agentConf "github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/proto"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/tests/mocks"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/multinet-monitor/networkAttachmentDefinition"
vppmanagerconfig "github.com/projectcalico/vpp-dataplane/vpp-manager/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/pod_interface"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
agentConf "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/proto"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/tests/mocks"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/v3/multinet-monitor/networkAttachmentDefinition"
vppmanagerconfig "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)
Expand Down
16 changes: 8 additions & 8 deletions calico-vpp-agent/cni/cni_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ import (
"github.com/pkg/errors"
calicov3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
felixConfig "github.com/projectcalico/calico/felix/config"
pb "github.com/projectcalico/vpp-dataplane/calico-vpp-agent/proto"
pb "github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/proto"
"github.com/sirupsen/logrus"
"google.golang.org/grpc"
tomb "gopkg.in/tomb.v2"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/pod_interface"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/pod_interface"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type Server struct {
Expand Down
10 changes: 5 additions & 5 deletions calico-vpp-agent/cni/network_vpp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"github.com/containernetworking/plugins/pkg/ns"
"github.com/pkg/errors"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type PodNSNotFoundErr struct {
Expand Down
6 changes: 3 additions & 3 deletions calico-vpp-agent/cni/network_vpp_hostports.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package cni

import (
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

func (s *Server) AddHostPort(podSpec *storage.LocalPodSpec, stack *vpplink.CleanupStack) error {
Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/cni/network_vpp_routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package cni

import (
"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

func (s *Server) RoutePodInterface(podSpec *storage.LocalPodSpec, stack *vpplink.CleanupStack, swIfIndex uint32, isL3 bool) error {
Expand Down
4 changes: 2 additions & 2 deletions calico-vpp-agent/cni/pod_annotations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/pkg/errors"
cnet "github.com/projectcalico/calico/libcalico-go/lib/net"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/cni/pod_interface/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package pod_interface

import (
"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
)

Expand Down
6 changes: 3 additions & 3 deletions calico-vpp-agent/cni/pod_interface/loopback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package pod_interface
import (
"github.com/pkg/errors"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/cni/pod_interface/memif.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (

"github.com/containernetworking/plugins/pkg/ns"
"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)
Expand Down
10 changes: 5 additions & 5 deletions calico-vpp-agent/cni/pod_interface/tuntap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type TunTapPodInterfaceDriver struct {
Expand Down
6 changes: 3 additions & 3 deletions calico-vpp-agent/cni/pod_interface/vcl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package pod_interface
import (
"fmt"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/cni/storage"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/cni/storage/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (

"github.com/lunixbochs/struc"
"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/sirupsen/logrus"
"google.golang.org/protobuf/types/known/anypb"

Expand All @@ -36,9 +36,9 @@ import (
bgpapi "github.com/osrg/gobgp/api"
calicov3 "github.com/projectcalico/api/pkg/apis/projectcalico/v3"
oldv3 "github.com/projectcalico/calico/libcalico-go/lib/apis/v3"
vppmanagerconfig "github.com/projectcalico/vpp-dataplane/vpp-manager/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
vppmanagerconfig "github.com/projectcalico/vpp-dataplane/v3/vpp-manager/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion calico-vpp-agent/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions calico-vpp-agent/connectivity/connectivity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
felixConfig "github.com/projectcalico/calico/felix/config"
oldv3 "github.com/projectcalico/calico/libcalico-go/lib/apis/v3"
calicov3cli "github.com/projectcalico/calico/libcalico-go/lib/clientv3"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/connectivity/connectivity_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"github.com/sirupsen/logrus"
tomb "gopkg.in/tomb.v2"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/watchers"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
)

type ConnectivityServer struct {
Expand Down
6 changes: 3 additions & 3 deletions calico-vpp-agent/connectivity/flat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"net"

"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type FlatL3Provider struct {
Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/connectivity/ipip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (

"github.com/pkg/errors"

"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type IpipProvider struct {
Expand Down
8 changes: 4 additions & 4 deletions calico-vpp-agent/connectivity/ipsec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"time"

"github.com/pkg/errors"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

type IpsecTunnel struct {
Expand Down
10 changes: 5 additions & 5 deletions calico-vpp-agent/connectivity/srv6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/projectcalico/calico/libcalico-go/lib/ipam"
cnet "github.com/projectcalico/calico/libcalico-go/lib/net"
"github.com/projectcalico/calico/libcalico-go/lib/options"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/vpplink"
"github.com/projectcalico/vpp-dataplane/vpplink/binapi/vppapi/ip_types"
"github.com/projectcalico/vpp-dataplane/vpplink/types"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/common"
"github.com/projectcalico/vpp-dataplane/v3/calico-vpp-agent/config"
"github.com/projectcalico/vpp-dataplane/v3/vpplink"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/binapi/vppapi/ip_types"
"github.com/projectcalico/vpp-dataplane/v3/vpplink/types"
)

// NodeToPrefixes is data holder for node and traffic destination prefixes (subnets) that should end in the given node
Expand Down
Loading

0 comments on commit f106b2f

Please sign in to comment.