Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit 61202dc

Browse files
johnoloughlinjohnoloughlin
committed
updating govpp api 0.7
Signed-off-by: John O'Loughlin <[email protected]>
1 parent 02c62d7 commit 61202dc

File tree

15 files changed

+40
-45
lines changed

15 files changed

+40
-45
lines changed

‎cniovs/cniovs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/client-go/kubernetes"
4242

4343
"github.com/containernetworking/cni/pkg/skel"
44-
"github.com/containernetworking/cni/pkg/types/current"
44+
current "github.com/containernetworking/cni/pkg/types/100"
4545

4646
"github.com/intel/userspace-cni-network-plugin/logging"
4747
"github.com/intel/userspace-cni-network-plugin/pkg/configdata"

‎cniovs/cniovs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"syscall"
2727
"testing"
2828

29-
"github.com/containernetworking/cni/pkg/types/current"
29+
current "github.com/containernetworking/cni/pkg/types/100"
3030
"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
3131
"github.com/intel/userspace-cni-network-plugin/pkg/types"
3232
"github.com/intel/userspace-cni-network-plugin/userspace/testdata"

‎cnivpp/api/bridge/bridge.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
package vppbridge
1818

1919
// Generates Go bindings for all VPP APIs located in the json directory.
20-
//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
20+
//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
2121

2222
import (
2323
"fmt"
2424

25-
"git.fd.io/govpp.git/api"
25+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
2626
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/l2"
27+
"go.fd.io/govpp/api"
2728
)
2829

2930
// Constants
@@ -101,7 +102,7 @@ func DeleteBridge(ch api.Channel, bridgeDomain uint32) error {
101102
}
102103

103104
// Attempt to add an interface to a Bridge Domain.
104-
func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId l2.InterfaceIndex) error {
105+
func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId interface_types.InterfaceIndex) error {
105106
var err error
106107

107108
// Determine if bridge domain exists, and if not, create it. CreateBridge()
@@ -135,7 +136,7 @@ func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId l2.Interface
135136
}
136137

137138
// Attempt to remove an interface from a Bridge Domain.
138-
func RemoveBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId l2.InterfaceIndex) error {
139+
func RemoveBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId interface_types.InterfaceIndex) error {
139140

140141
// Populate the Request Structure
141142
req := &l2.SwInterfaceSetL2Bridge{

‎cnivpp/api/infra/infra.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
package vppinfra
1818

1919
// Generates Go bindings for all VPP APIs located in the json directory.
20-
//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
20+
//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
2121

2222
import (
2323
"fmt"
2424

2525
"github.com/sirupsen/logrus"
2626

27-
"git.fd.io/govpp.git"
28-
"git.fd.io/govpp.git/api"
29-
"git.fd.io/govpp.git/core"
27+
"go.fd.io/govpp"
28+
"go.fd.io/govpp/api"
29+
"go.fd.io/govpp/core"
3030
)
3131

3232
//

‎cnivpp/api/interface/interface.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
package vppinterface
1818

1919
// Generates Go bindings for all VPP APIs located in the json directory.
20-
//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
20+
//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
2121

2222
import (
2323
"fmt"
2424

25-
"github.com/containernetworking/cni/pkg/types/current"
26-
27-
"git.fd.io/govpp.git/api"
28-
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interfaces"
25+
current "github.com/containernetworking/cni/pkg/types/100"
26+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface"
27+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
28+
"go.fd.io/govpp/api"
2929
)
3030

3131
// Constants
@@ -36,7 +36,7 @@ const debugInterface = false
3636
//
3737

3838
// Attempt to set an interface state. isUp (1 = up, 0 = down)
39-
func SetState(ch api.Channel, swIfIndex interfaces.InterfaceIndex, isUp interfaces.IfStatusFlags) error {
39+
func SetState(ch api.Channel, swIfIndex interface_types.InterfaceIndex, isUp interface_types.IfStatusFlags) error {
4040
// Populate the Add Structure
4141
req := &interfaces.SwInterfaceSetFlags{
4242
SwIfIndex: swIfIndex,
@@ -58,7 +58,7 @@ func SetState(ch api.Channel, swIfIndex interfaces.InterfaceIndex, isUp interfac
5858
return nil
5959
}
6060

61-
func AddDelIpAddress(ch api.Channel, swIfIndex interfaces.InterfaceIndex, isAdd bool, ipResult *current.Result) error {
61+
func AddDelIpAddress(ch api.Channel, swIfIndex interface_types.InterfaceIndex, isAdd bool, ipResult *current.Result) error {
6262

6363
// Populate the Add Structure
6464
req := &interfaces.SwInterfaceAddDelAddress{

‎cnivpp/api/memif/memif.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717
package vppmemif
1818

1919
// Generates Go bindings for all VPP APIs located in the json directory.
20-
//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
20+
//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
2121

2222
import (
2323
// "net"
2424

2525
"os"
2626
"path/filepath"
2727

28-
"git.fd.io/govpp.git/api"
28+
"go.fd.io/govpp/api"
2929

30-
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interfaces"
30+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
3131
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
32-
3332
"github.com/intel/userspace-cni-network-plugin/logging"
3433
)
3534

@@ -69,7 +68,7 @@ var stateStr = [...]string{"dn", "up"}
6968
// ch api.Channel
7069
// socketId uint32
7170
// role MemifRole - RoleMaster or RoleSlave
72-
func CreateMemifInterface(ch api.Channel, socketId uint32, role memif.MemifRole, mode memif.MemifMode) (swIfIndex interfaces.InterfaceIndex, err error) {
71+
func CreateMemifInterface(ch api.Channel, socketId uint32, role memif.MemifRole, mode memif.MemifMode) (swIfIndex interface_types.InterfaceIndex, err error) {
7372

7473
// Populate the Add Structure
7574
req := &memif.MemifCreate{
@@ -95,7 +94,7 @@ func CreateMemifInterface(ch api.Channel, socketId uint32, role memif.MemifRole,
9594
}
9695
return
9796
} else {
98-
swIfIndex = interfaces.InterfaceIndex(reply.SwIfIndex)
97+
swIfIndex = interface_types.InterfaceIndex(reply.SwIfIndex)
9998
}
10099

101100
return
@@ -104,7 +103,7 @@ func CreateMemifInterface(ch api.Channel, socketId uint32, role memif.MemifRole,
104103
// Attempt to delete a memif interface. If the deleted MemIf Interface
105104
// is the last interface associated with a socketfile, this function
106105
// will attempt to delete it.
107-
func DeleteMemifInterface(ch api.Channel, swIfIndex memif.InterfaceIndex) (err error) {
106+
func DeleteMemifInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (err error) {
108107

109108
// Determine if memif interface exists
110109
socketId, exist := findMemifInterface(ch, swIfIndex)
@@ -306,7 +305,7 @@ func DumpMemifSocket(ch api.Channel) {
306305
//
307306

308307
// Find the given memif interface and return socketId if it exists
309-
func findMemifInterface(ch api.Channel, swIfIndex memif.InterfaceIndex) (socketId uint32, found bool) {
308+
func findMemifInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (socketId uint32, found bool) {
310309

311310
// Populate the Message Structure
312311
req := &memif.MemifDump{}

‎cnivpp/api/vhostuser/vhostuser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package vppvhostuser
1818

1919
// Generates Go bindings for all VPP APIs located in the json directory.
20-
//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
20+
//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
2121

2222
import (
2323
"fmt"
2424

25-
"git.fd.io/govpp.git/api"
25+
"go.fd.io/govpp/api"
2626
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/vhost_user"
2727
)
2828

‎cnivpp/cnivpp.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,18 @@ import (
3131
"path/filepath"
3232
"strconv"
3333

34-
// "git.fd.io/govpp.git/examples/binapi/memif"
35-
3634
v1 "k8s.io/api/core/v1"
3735
"k8s.io/client-go/kubernetes"
3836

3937
"github.com/containernetworking/cni/pkg/skel"
40-
"github.com/containernetworking/cni/pkg/types/current"
38+
current "github.com/containernetworking/cni/pkg/types/100"
4139

4240
"github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
4341
"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
4442
"github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
4543
"github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
46-
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/l2"
4744
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
48-
45+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
4946
"github.com/intel/userspace-cni-network-plugin/logging"
5047
"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
5148
"github.com/intel/userspace-cni-network-plugin/pkg/types"
@@ -129,7 +126,7 @@ func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
129126

130127
// Add Interface to Bridge. If Bridge does not exist, AddBridgeInterface()
131128
// will create.
132-
err = vppbridge.AddBridgeInterface(vppCh.Ch, bridgeDomain, l2.InterfaceIndex(data.interfaceSwIfIndex))
129+
err = vppbridge.AddBridgeInterface(vppCh.Ch, bridgeDomain, interface_types.InterfaceIndex(data.interfaceSwIfIndex))
133130
if err != nil {
134131
logging.Debugf("AddOnHost(vpp): Error adding interface to bridge: %v", err)
135132
return err
@@ -211,7 +208,7 @@ func (cniVpp CniVpp) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
211208

212209
// Remove MemIf from Bridge. RemoveBridgeInterface() will delete Bridge if
213210
// no more interfaces are associated with the Bridge.
214-
err = vppbridge.RemoveBridgeInterface(vppCh.Ch, bridgeDomain, l2.InterfaceIndex(data.interfaceSwIfIndex))
211+
err = vppbridge.RemoveBridgeInterface(vppCh.Ch, bridgeDomain, interface_types.InterfaceIndex(data.interfaceSwIfIndex))
215212

216213
if err != nil {
217214
logging.Debugf("DelFromHost(vpp): Error removing interface from bridge: %v", err)
@@ -323,7 +320,7 @@ func delLocalDeviceMemif(vppCh vppinfra.ConnectionData, conf *types.NetConf, arg
323320
memifSocketPath := getMemifSocketfileName(conf, sharedDir, args.ContainerID, args.IfName)
324321

325322
// Delete the memif interface
326-
err = vppmemif.DeleteMemifInterface(vppCh.Ch, memif.InterfaceIndex(data.interfaceSwIfIndex))
323+
err = vppmemif.DeleteMemifInterface(vppCh.Ch, interface_types.InterfaceIndex(data.interfaceSwIfIndex))
327324
if err != nil {
328325
logging.Debugf("delLocalDeviceMemif(vpp): Error deleting memif inteface: %v", err)
329326
return

‎cnivpp/localdb.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ import (
3434

3535
"github.com/containernetworking/cni/pkg/skel"
3636

37-
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interfaces"
38-
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/l2"
37+
"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
3938
"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
4039
"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
4140
"github.com/intel/userspace-cni-network-plugin/pkg/types"
@@ -53,8 +52,7 @@ const debugVppDb = false
5352
// This structure is a union of all the VPP data (for all types of
5453
// interfaces) that need to be preserved for later use.
5554
type VppSavedData struct {
56-
l2SwIfIndex l2.InterfaceIndex `json:"swIfIndex"`
57-
interfaceSwIfIndex interfaces.InterfaceIndex `json:"swIfIndex"` // Software Index, used to access the created interface, needed to delete interface.
55+
interfaceSwIfIndex interface_types.InterfaceIndex `json:"swIfIndex"` // Software Index, used to access the created interface, needed to delete interface.
5856
MemifSocketId uint32 `json:"memifSocketId"` // Memif SocketId, used to access the created memif Socket File, used for debug only.
5957
}
6058

‎cnivpp/test/ipAddDel/ipAddDel.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"time"
2828

2929
_ "git.fd.io/govpp.git/core"
30-
"github.com/containernetworking/cni/pkg/types/current"
30+
current "github.com/containernetworking/cni/pkg/types/100"
3131
_ "github.com/sirupsen/logrus"
3232

3333
"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"

‎pkg/configdata/configdata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"k8s.io/client-go/kubernetes"
3333

3434
"github.com/containernetworking/cni/pkg/skel"
35-
"github.com/containernetworking/cni/pkg/types/current"
35+
current "github.com/containernetworking/cni/pkg/types/100"
3636

3737
"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
3838
"github.com/intel/userspace-cni-network-plugin/pkg/types"

‎pkg/configdata/configdata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"testing"
2727

2828
"github.com/containernetworking/cni/pkg/skel"
29-
"github.com/containernetworking/cni/pkg/types/current"
29+
current "github.com/containernetworking/cni/pkg/types/100"
3030
"github.com/intel/userspace-cni-network-plugin/pkg/types"
3131
"github.com/intel/userspace-cni-network-plugin/userspace/testdata"
3232
"github.com/stretchr/testify/assert"

‎pkg/types/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package types
1616

1717
import (
1818
"github.com/containernetworking/cni/pkg/types"
19-
"github.com/containernetworking/cni/pkg/types/current"
19+
current "github.com/containernetworking/cni/pkg/types/100" // -> "github.com/containernetworking/cni/pkg/types/current"
2020
)
2121

2222
//

‎userspace/userspace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/containernetworking/cni/pkg/invoke"
2727
"github.com/containernetworking/cni/pkg/skel"
2828
cnitypes "github.com/containernetworking/cni/pkg/types"
29-
"github.com/containernetworking/cni/pkg/types/current"
29+
current "github.com/containernetworking/cni/pkg/types/100"
3030
cniSpecVersion "github.com/containernetworking/cni/pkg/version"
3131
"github.com/containernetworking/plugins/pkg/ip"
3232
"github.com/containernetworking/plugins/pkg/ipam"

‎usrspcni/usrspcni.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"k8s.io/client-go/kubernetes"
2020

2121
"github.com/containernetworking/cni/pkg/skel"
22-
"github.com/containernetworking/cni/pkg/types/current"
22+
current "github.com/containernetworking/cni/pkg/types/100"
2323

2424
"github.com/intel/userspace-cni-network-plugin/pkg/types"
2525
)

0 commit comments

Comments
 (0)