support yusur smartnic

Signed-off-by: wangs <[email protected]>

pkg/daemon/ovs_linux.go

@@ -71,7 +71,7 @@ func (csh cniServerHandler) configureDpdkNic(podName, podNamespace, provider, ne
 func (csh cniServerHandler) configureNic(podName, podNamespace, provider, netns, containerID, vfDriver, ifName, mac string, mtu int, ip, gateway string, isDefaultRoute, detectIPConflict bool, routes []request.Route, _, _ []string, ingress, egress, deviceID, nicType, latency, limit, loss, jitter string, gwCheckMode int, u2oInterconnectionIP, oldPodName string) ([]request.Route, error) {
 	var err error
 	var hostNicName, containerNicName, pfPci string
-	var vfId int
+	var vfID int
 	if deviceID == "" {
 		hostNicName, containerNicName, err = setupVethPair(containerID, ifName, mtu)
 		if err != nil {
@@ -87,7 +87,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, provider, netns,
 			}
 		}()
 	} else {
-		hostNicName, containerNicName, pfPci, vfId, err = setupSriovInterface(containerID, deviceID, vfDriver, ifName, mtu, mac)
+		hostNicName, containerNicName, pfPci, vfID, err = setupSriovInterface(containerID, deviceID, vfDriver, ifName, mtu, mac)
 		if err != nil {
 			klog.Errorf("failed to create sriov interfaces %v", err)
 			return nil, err
@@ -102,7 +102,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, provider, netns,
 		// Add yusur ovs port
 		output, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", hostNicName, "--",
 			"set", "interface", hostNicName, "type=dpdk",
-			fmt.Sprintf("options:dpdk-devargs=%s,representor=[%d]", pfPci, vfId),
+			fmt.Sprintf("options:dpdk-devargs=%s,representor=[%d]", pfPci, vfID),
 			fmt.Sprintf("mtu_request=%d", mtu),
 			fmt.Sprintf("external_ids:iface-id=%s", ifaceID),
 			fmt.Sprintf("external_ids:vendor=%s", util.CniTypeName),

pkg/net/yusur/yusur_sriovnet.go

@@ -1,6 +1,7 @@
 package yusur
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -34,29 +35,25 @@ func IsYusurSmartNic(pciAddress string) bool {
 	}
 
 	yusurSmartNic := strings.TrimSpace(string(platName))
-	if strings.HasSuffix(yusurSmartNic, YusurSmartNic) {
-		return true
-	}
-
-	return false
+	return strings.HasSuffix(yusurSmartNic, YusurSmartNic)
 }
 
 // GetYusurNicPfPciFromVfPci retrieves the PF PCI address
 func GetYusurNicPfPciFromVfPci(vfPciAddress string) (string, error) {
 	pfPath := filepath.Join(PciSysDir, vfPciAddress, "physfn")
 	absPath, err := filepath.Abs(pfPath)
 	if err != nil || !strings.HasPrefix(absPath, PciSysDir) {
-		return "", fmt.Errorf("pfPath is not ")
+		return "", errors.New("pfPath is not ")
 	}
 
 	pciDevDir, err := os.Readlink(absPath)
 	if err != nil {
-		return "", fmt.Errorf("failed to read physfn link, provided address may not be a VF. %v", err)
+		return "", fmt.Errorf("failed to read physfn link, provided address may not be a VF. %w", err)
 	}
 
 	pf := path.Base(pciDevDir)
 	if pf == "" {
-		return pf, fmt.Errorf("could not find PF PCI Address")
+		return pf, errors.New("could not find PF PCI Address")
 	}
 	return pf, err
 }
@@ -78,7 +75,7 @@ func GetYusurNicVfIndexByPciAddress(vfPciAddress string) (int, error) {
 	vfPath := filepath.Join(PciSysDir, vfPciAddress, "physfn", "virtfn*")
 	absPath, err := filepath.Abs(vfPath)
 	if err != nil || !strings.HasPrefix(absPath, PciSysDir) {
-		return -1, fmt.Errorf("pfPath is not ")
+		return -1, errors.New("pfPath is not ")
 	}
 
 	matches, err := filepath.Glob(absPath)