fix find bridge function

VPP changed default calue for SwIfIndex to 4294967295
As go was setting this to 0 the bridge was never found

Signed-off-by: John O'Loughlin <[email protected]>

Author: johnoloughlin

Diff for: cnivpp/api/bridge/bridge.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/l2"
+	. "github.com/intel/userspace-cni-network-plugin/pkg/types"
 	"go.fd.io/govpp/api"
 )
 
@@ -174,7 +175,7 @@ func DumpBridge(ch api.Channel, bridgeDomain uint32) {
 
 	// Populate the Message Structure
 	req := &l2.BridgeDomainDump{
-		BdID: bridgeDomain,
+		BdID: bridgeDomain, SwIfIndex: DefaultSwIfIndex,
 	}
 
 	reply := &l2.BridgeDomainDetails{}
@@ -220,7 +221,7 @@ func findBridge(ch api.Channel, bridgeDomain uint32) (bool, uint32) {
 
 	// Populate the Message Structure
 	req := &l2.BridgeDomainDump{
-		BdID: bridgeDomain,
+		BdID: bridgeDomain, SwIfIndex: DefaultSwIfIndex,
 	}
 	reqCtx := ch.SendMultiRequest(req)
 

Diff for: pkg/types/types.go

@@ -19,9 +19,7 @@ import (
 	current "github.com/containernetworking/cni/pkg/types/100"
 )
 
-//
 // Exported Types
-//
 type MemifConf struct {
 	Role string `json:"role,omitempty"` // Role of memif: master|slave
 	Mode string `json:"mode,omitempty"` // Mode of memif: ip|ethernet|inject-punt
@@ -115,13 +113,15 @@ type NetConf struct {
 }
 
 // Defines the JSON data written to container. It is either written to:
-//  1) Annotation - "userspace/configuration-data"
-//  -- OR --
-//  2) a file in the directory designated by NetConf.SharedDir.
+//  1. Annotation - "userspace/configuration-data"
+//     -- OR --
+//  2. a file in the directory designated by NetConf.SharedDir.
 type ConfigurationData struct {
 	ContainerId string         `json:"containerId"` // From args.ContainerId, used locally. Used in several place, namely in the socket filenames.
 	IfName      string         `json:"ifName"`      // From args.IfName, used locally. Used in several place, namely in the socket filenames.
 	Name        string         `json:"name"`        // From NetConf.Name
 	Config      UserSpaceConf  `json:"config"`      // From NetConf.ContainerConf
 	IPResult    current.Result `json:"ipResult"`    // Network Status also has IP, but wrong format
 }
+
+const DefaultSwIfIndex = 4294967295 // vpp default interface id, used when querying bridges