api updates

updates flagged by golangci-lint

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

Author: johnoloughlin

Diff for: cniovs/cniovs.go

@@ -48,23 +48,17 @@ import (
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )
 
-//
 // Constants
-//
 const (
 	defaultBridge               = "br0"
 	DefaultHostVhostuserBaseDir = "/var/lib/vhost_sockets/"
 )
 
-//
 // Types
-//
 type CniOvs struct {
 }
 
-//
 // API Functions
-//
 func (cniOvs CniOvs) AddOnHost(conf *types.NetConf,
 	args *skel.CmdArgs,
 	kubeClient kubernetes.Interface,
@@ -196,7 +190,11 @@ func (cniOvs CniOvs) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
 func (cniOvs CniOvs) DelFromContainer(conf *types.NetConf, args *skel.CmdArgs, sharedDir string, pod *v1.Pod) error {
 	logging.Infof("OVS DelFromContainer: ENTER - Container %s Iface %s", args.ContainerID[:12], args.IfName)
 
-	configdata.FileCleanup(sharedDir, "")
+	var err = configdata.FileCleanup(sharedDir, "")
+
+	if err != nil {
+		logging.Debugf("DelFromContainer(ovs): %v", err)
+	}
 
 	return nil
 }
@@ -243,15 +241,15 @@ func createSharedDir(sharedDir, oldSharedDir string) error {
 	if os.IsNotExist(err) {
 		err = os.MkdirAll(sharedDir, 0750)
 		if err != nil {
-			logging.Errorf("createSharedDir: Failed to create dir (%s): %v", sharedDir, err)
+			_ = logging.Errorf("createSharedDir: Failed to create dir (%s): %v", sharedDir, err)
 			return err
 		}
 
 		if strings.Contains(sharedDir, DefaultHostVhostuserBaseDir) {
 			logging.Debugf("createSharedDir: Mount from %s to %s", oldSharedDir, sharedDir)
 			err = unix.Mount(oldSharedDir, sharedDir, "", unix.MS_BIND, "")
 			if err != nil {
-				logging.Errorf("createSharedDir: Failed to bind mount: %s", err)
+				_ = logging.Errorf("createSharedDir: Failed to bind mount: %s", err)
 				return err
 			}
 		}
@@ -296,15 +294,15 @@ func addLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 	sharedDir := getShortSharedDir(actualSharedDir)
 	err = createSharedDir(sharedDir, actualSharedDir)
 	if err != nil {
-		logging.Errorf("addLocalDeviceVhost: Failed to create shared dir: %v", err)
+		_ = logging.Errorf("addLocalDeviceVhost: Failed to create shared dir: %v", err)
 		return err
 	}
 
 	group := conf.HostConf.VhostConf.Group
 	if group != "" {
 		err = setSharedDirGroup(sharedDir, group)
 		if err != nil {
-			logging.Errorf("addLocalDeviceVhost: Failed to set shared dir group: %v", err)
+			_ = logging.Errorf("addLocalDeviceVhost: Failed to set shared dir group: %v", err)
 			return err
 		}
 	}
@@ -341,7 +339,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 	// ovs-vsctl --if-exists del-port
 	err := deleteVhostPort(data.Vhostname, conf.HostConf.BridgeConf.BridgeName)
 	if err != nil {
-		logging.Errorf("delLocalDeviceVhost: Failed to delete port: %v", err)
+		_ = logging.Errorf("delLocalDeviceVhost: Failed to delete port: %v", err)
 		return err
 	}
 
@@ -350,17 +348,17 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 		logging.Debugf("delLocalDeviceVhost: Unmount shared directory: %v", sharedDir)
 		_, err = os.Stat(sharedDir)
 		if os.IsNotExist(err) {
-			logging.Errorf("delLocalDeviceVhost: shared directory %s does not exist to unmount", sharedDir)
+			_ = logging.Errorf("delLocalDeviceVhost: shared directory %s does not exist to unmount", sharedDir)
 			return nil
 		}
 		err = unix.Unmount(sharedDir, 0)
 		if err != nil {
-			logging.Errorf("Failed to unmount dir: %v", err)
+			_ = logging.Errorf("Failed to unmount dir: %v", err)
 			return err
 		}
 		err = os.Remove(sharedDir)
 		if err != nil {
-			logging.Errorf("Failed to remove dir: %v", err)
+			_ = logging.Errorf("Failed to remove dir: %v", err)
 			return err
 		}
 	} else {
@@ -379,7 +377,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 
 		// Remove files with matching container ID and IfName
 		for _, fileName := range filesForContainerID {
-			if match, _ := regexp.MatchString(fileBaseName+"*", fileName); match == true {
+			if match, _ := regexp.MatchString(fileBaseName+"*", fileName); match {
 				logging.Debugf("OVS DelFromContainer: %s matches file %s", fileBaseName, fileName)
 				file := filepath.Join(sharedDir, fileName)
 				if err = os.Remove(file); err != nil {
@@ -392,7 +390,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 
 			// In case the Socketfile name was passed in:
 			if conf.HostConf.VhostConf.Socketfile != fileBaseName {
-				if match, _ := regexp.MatchString(conf.HostConf.VhostConf.Socketfile+"*", fileName); match == true {
+				if match, _ := regexp.MatchString(conf.HostConf.VhostConf.Socketfile+"*", fileName); match {
 					file := filepath.Join(sharedDir, fileName)
 					if err = os.Remove(file); err != nil {
 						return err
@@ -415,7 +413,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 func addLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) error {
 	var err error
 
-	if found := findBridge(conf.HostConf.BridgeConf.BridgeName); found == false {
+	if found := findBridge(conf.HostConf.BridgeConf.BridgeName); !found {
 		logging.Debugf("addLocalNetworkBridge(): Bridge %s not found, creating", conf.HostConf.BridgeConf.BridgeName)
 		err = createBridge(conf.HostConf.BridgeConf.BridgeName)
 
@@ -438,7 +436,7 @@ func addLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSav
 func delLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) error {
 	var err error
 
-	if containInterfaces := doesBridgeContainInterfaces(conf.HostConf.BridgeConf.BridgeName); containInterfaces == false {
+	if containInterfaces := doesBridgeContainInterfaces(conf.HostConf.BridgeConf.BridgeName); !containInterfaces {
 		logging.Debugf("delLocalNetworkBridge(): No interfaces found, deleting Bridge %s", conf.HostConf.BridgeConf.BridgeName)
 		err = deleteBridge(conf.HostConf.BridgeConf.BridgeName)
 	} else {

Diff for: cniovs/cniovs_test.go

@@ -219,7 +219,7 @@ func TestGenerateRandomMacAddress(t *testing.T) {
 		macs := make(map[string]int)
 		for i := 0; i < nr; i++ {
 			mac := generateRandomMacAddress()
-			ok, err := regexp.Match("^[0-9a-fA-F]{2}(:([0-9a-fA-F]){2}){5}$", []byte(mac))
+			ok, err := regexp.Compile("^[0-9a-fA-F]{2}(:([0-9a-fA-F]){2}){5}$", []byte(mac))
 			require.NoError(t, err, fmt.Sprintf("MAC is incorrect. MAC: %q", mac))
 			require.True(t, ok, fmt.Sprintf("MAC is incorrect. MAC: %q", mac))
 			macs[mac]++

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

@@ -77,7 +77,7 @@ func DeleteBridge(ch api.Channel, bridgeDomain uint32) error {
 
 	// Determine if bridge domain exists
 	exists, count := findBridge(ch, bridgeDomain)
-	if exists == false || count != 0 {
+	if !exists || count != 0 {
 		return nil
 	}
 

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

@@ -38,14 +38,14 @@ import (
 
 const debugMemif = false
 
-type MemifRole uint8
+type MemifRole uint32
 
 const (
 	RoleMaster MemifRole = 0
 	RoleSlave  MemifRole = 1
 )
 
-type MemifMode uint8
+type MemifMode uint32
 
 const (
 	ModeEthernet   MemifMode = 0
@@ -56,7 +56,6 @@ const (
 // Dump Strings
 var modeStr = [...]string{"eth", "ip ", "pnt"}
 var roleStr = [...]string{"master", "slave "}
-var stateStr = [...]string{"dn", "up"}
 
 //
 // API Functions
@@ -108,7 +107,7 @@ func DeleteMemifInterface(ch api.Channel, swIfIndex interface_types.InterfaceInd
 	// Determine if memif interface exists
 	socketId, exist := findMemifInterface(ch, swIfIndex)
 	if debugMemif {
-		if exist == false {
+		if !exist {
 			logging.Verbosef("Error deleting memif interface: memif interface (swIfIndex=%d) Does NOT Exist", swIfIndex)
 		} else {
 			logging.Verbosef("Attempting to delete memif interface %d with SocketId %d", swIfIndex, socketId)
@@ -428,10 +427,10 @@ func findMemifSocket(ch api.Channel, socketFilename string) (found bool, socketI
 	// If input SocketFilename has not been created, then loop
 	// through the list of existing SocketIds and find an unused Id.
 	//
-	if found == false {
+	if !found {
 		socketId = 1
 
-		for done == false {
+		for !done {
 
 			done = true
 			for i := 0; i < count; i++ {

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

@@ -22,8 +22,9 @@ package vppvhostuser
 import (
 	"fmt"
 
-	"go.fd.io/govpp/api"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/vhost_user"
+	"go.fd.io/govpp/api"
 )
 
 //
@@ -32,34 +33,32 @@ import (
 
 const debugVhost = false
 
-type VhostUserMode uint8
+type VhostUserMode bool
 
 const (
-	ModeClient VhostUserMode = 0
-	ModeServer VhostUserMode = 1
+	ModeClient VhostUserMode = false
+	ModeServer VhostUserMode = true
 )
 
-// Dump Strings
-var modeStr = [...]string{"client", "server"}
-
 //
 // API Functions
 //
 
 // Attempt to create a Vhost-User Interface.
 // Input:
-//   ch api.Channel
-//   mode VhostUserMode - ModeClient or ModeServer
-//   socketFile string - Directory and Filename of socket file
-func CreateVhostUserInterface(ch api.Channel, mode VhostUserMode, socketFile string) (swIfIndex uint32, err error) {
+//
+//	ch api.Channel
+//	mode VhostUserMode - ModeClient or ModeServer
+//	socketFile string - Directory and Filename of socket file
+func CreateVhostUserInterface(ch api.Channel, mode bool, socketFile string) (swIfIndex interface_types.InterfaceIndex, err error) {
 
 	// Populate the Add Structure
 	req := &vhost_user.CreateVhostUserIf{
-		IsServer:          uint8(mode),
-		SockFilename:      []byte(socketFile),
-		Renumber:          0,
+		IsServer:          mode,
+		SockFilename:      socketFile,
+		Renumber:          false,
 		CustomDevInstance: 0,
-		UseCustomMac:      0,
+		UseCustomMac:      false,
 		//MacAddress: "",
 		//Tag: "",
 	}
@@ -81,7 +80,7 @@ func CreateVhostUserInterface(ch api.Channel, mode VhostUserMode, socketFile str
 }
 
 // Attempt to delete a Vhost-User interface.
-func DeleteVhostUserInterface(ch api.Channel, swIfIndex uint32) (err error) {
+func DeleteVhostUserInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (err error) {
 
 	// Populate the Delete Structure
 	req := &vhost_user.DeleteVhostUserIf{
@@ -122,13 +121,14 @@ func DumpVhostUser(ch api.Channel) {
 		}
 		//fmt.Printf("%+v\n", reply)
 
-		fmt.Printf("    SwIfId=%d Mode=%s IfName=%s NumReg=%d SockErrno=%d Feature=0x16%x HdrSz=%d SockFile=%s\n",
+		fmt.Printf("    SwIfId=%d Mode=%t IfName=%s NumReg=%d SockErrno=%d FeaturesFirst32=%d FeaturesLast32=%d HdrSz=%d SockFile=%s\n",
 			reply.SwIfIndex,
-			modeStr[reply.IsServer],
+			reply.IsServer,
 			string(reply.InterfaceName),
 			reply.NumRegions,
 			reply.SockErrno,
-			reply.Features,
+			reply.FeaturesFirst32,
+			reply.FeaturesLast32,
 			reply.VirtioNetHdrSz,
 			string(reply.SockFilename))
 

Diff for: cnivpp/cnivpp.go

@@ -37,12 +37,12 @@ import (
 	"github.com/containernetworking/cni/pkg/skel"
 	current "github.com/containernetworking/cni/pkg/types/100"
 
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
+	vppbridge "github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
+	vppinfra "github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
+	vppinterface "github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
+	vppmemif "github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
 	"github.com/intel/userspace-cni-network-plugin/logging"
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
@@ -231,8 +231,6 @@ func (cniVpp CniVpp) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
 	} else {
 		return fmt.Errorf("ERROR: Unknown HostConf.Type:" + conf.HostConf.IfType)
 	}
-
-	return err
 }
 
 func (cniVpp CniVpp) DelFromContainer(conf *types.NetConf, args *skel.CmdArgs, sharedDir string, pod *v1.Pod) error {

Diff for: cnivpp/localdb.go

@@ -40,9 +40,7 @@ import (
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )
 
-//
 // Constants
-//
 const debugVppDb = false
 
 //
@@ -53,15 +51,16 @@ const debugVppDb = false
 // interfaces) that need to be preserved for later use.
 type VppSavedData struct {
 	interfaceSwIfIndex interface_types.InterfaceIndex `json:"swIfIndex"`     // Software Index, used to access the created interface, needed to delete interface.
-	MemifSocketId      uint32                    `json:"memifSocketId"` // Memif SocketId, used to access the created memif Socket File, used for debug only.
+	MemifSocketId      uint32                         `json:"memifSocketId"` // Memif SocketId, used to access the created memif Socket File, used for debug only.
 }
 
 //
 // API Functions
 //
 
 // saveVppConfig() - Some data needs to be saved, like the swIfIndex, for cmdDel().
-//  This function squirrels the data away to be retrieved later.
+//
+//	This function squirrels the data away to be retrieved later.
 func SaveVppConfig(conf *types.NetConf, args *skel.CmdArgs, data *VppSavedData) error {
 
 	// Current implementation is to write data to a file with the name: