Drop MAC address check and rename LinkAdmState

Signed-off-by: Vasilis Remmas <vremmas@nvidia.com>
k8snetworkplumbingwg · May 8, 2024 · b30ab24 · b30ab24
1 parent 1f7786e
commit b30ab24
Show file tree

Hide file tree

Showing 7 changed files with 200 additions and 310 deletions.
diff --git a/api/v1/helper.go b/api/v1/helper.go
@@ -272,8 +272,8 @@ func NeedToUpdateSriov(ifaceSpec *Interface, ifaceStatus *InterfaceExt) bool {
 		return true
 	}
 
-	if ifaceStatus.LinkAdmState == "down" {
-		log.V(2).Info("NeedToUpdateSriov(): PF link status needs update", "desired to include", "up", "current", ifaceStatus.LinkAdmState)
+	if ifaceStatus.LinkAdminState == "down" {
+		log.V(2).Info("NeedToUpdateSriov(): PF link status needs update", "desired to include", "up", "current", ifaceStatus.LinkAdminState)
 		return true
 	}
 
@@ -307,20 +307,11 @@ func NeedToUpdateSriov(ifaceSpec *Interface, ifaceStatus *InterfaceExt) bool {
 						}
 
 						if strings.EqualFold(ifaceStatus.LinkType, consts.LinkTypeETH) {
-							// We do this check only if a MAC address is set to ensure that we were able to read the MAC
-							// address. We intentionally skip empty MAC address in vfStatus because this may happen
-							// when the VF is allocated to a workload.
-							if vfStatus.Mac == consts.DefaultMAC {
-								log.V(2).Info("NeedToUpdateSriov(): VF MAC Address needs update",
-									"vf", vfStatus.VfID, "current", vfStatus.Mac)
-								return true
-							}
-
 							if groupSpec.IsRdma {
 								// We do this check only if a Node GUID is set to ensure that we were able to read the
 								// Node GUID. We intentionally skip empty Node GUID in vfStatus because this may happen
 								// when the VF is allocated to a workload.
-								if vfStatus.GUID == consts.DefaultNodeGUID {
+								if vfStatus.GUID == consts.UninitializedNodeGUID {
 									log.V(2).Info("NeedToUpdateSriov(): VF GUID needs update",
 										"vf", vfStatus.VfID, "current", vfStatus.GUID)
 									return true
@@ -330,7 +321,7 @@ func NeedToUpdateSriov(ifaceSpec *Interface, ifaceStatus *InterfaceExt) bool {
 							// We do this check only if a Node GUID is set to ensure that we were able to read the
 							// Node GUID. We intentionally skip empty Node GUID in vfStatus because this may happen
 							// when the VF is allocated to a workload.
-							if vfStatus.GUID == consts.DefaultNodeGUID {
+							if vfStatus.GUID == consts.UninitializedNodeGUID {
 								log.V(2).Info("NeedToUpdateSriov(): VF GUID needs update",
 									"vf", vfStatus.VfID, "current", vfStatus.GUID)
 								return true

diff --git a/api/v1/sriovnetworknodestate_types.go b/api/v1/sriovnetworknodestate_types.go
@@ -63,7 +63,7 @@ type InterfaceExt struct {
 	NumVfs            int               `json:"numVfs,omitempty"`
 	LinkSpeed         string            `json:"linkSpeed,omitempty"`
 	LinkType          string            `json:"linkType,omitempty"`
-	LinkAdmState      string            `json:"linkAdmState,omitempty"`
+	LinkAdminState    string            `json:"linkAdminState,omitempty"`
 	EswitchMode       string            `json:"eSwitchMode,omitempty"`
 	ExternallyManaged bool              `json:"externallyManaged,omitempty"`
 	TotalVfs          int               `json:"totalvfs,omitempty"`

diff --git a/config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -137,7 +137,7 @@ spec:
                       type: string
                     externallyManaged:
                       type: boolean
-                    linkAdmState:
+                    linkAdminState:
                       type: string
                     linkSpeed:
                       type: string

diff --git a/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/deployment/sriov-network-operator/crds/sriovnetwork.openshift.io_sriovnetworknodestates.yaml
@@ -137,7 +137,7 @@ spec:
                       type: string
                     externallyManaged:
                       type: boolean
-                    linkAdmState:
+                    linkAdminState:
                       type: string
                     linkSpeed:
                       type: string

diff --git a/pkg/consts/constants.go b/pkg/consts/constants.go
@@ -43,8 +43,7 @@ const (
 	LinkTypeIB  = "IB"
 	LinkTypeETH = "ETH"
 
-	DefaultNodeGUID = "0000:0000:0000:0000"
-	DefaultMAC      = "00:00:00:00:00:00"
+	UninitializedNodeGUID = "0000:0000:0000:0000"
 
 	DeviceTypeVfioPci   = "vfio-pci"
 	DeviceTypeNetDevice = "netdevice"

diff --git a/pkg/host/internal/sriov/sriov.go b/pkg/host/internal/sriov/sriov.go
@@ -261,16 +261,16 @@ func (s *sriov) DiscoverSriovDevices(storeManager store.ManagerInterface) ([]sri
 		}
 
 		iface := sriovnetworkv1.InterfaceExt{
-			Name:         pfNetName,
-			PciAddress:   device.Address,
-			Driver:       driver,
-			Vendor:       device.Vendor.ID,
-			DeviceID:     device.Product.ID,
-			Mtu:          link.Attrs().MTU,
-			Mac:          link.Attrs().HardwareAddr.String(),
-			LinkType:     s.encapTypeToLinkType(link.Attrs().EncapType),
-			LinkSpeed:    s.networkHelper.GetNetDevLinkSpeed(pfNetName),
-			LinkAdmState: s.networkHelper.GetNetDevLinkAdminState(pfNetName),
+			Name:           pfNetName,
+			PciAddress:     device.Address,
+			Driver:         driver,
+			Vendor:         device.Vendor.ID,
+			DeviceID:       device.Product.ID,
+			Mtu:            link.Attrs().MTU,
+			Mac:            link.Attrs().HardwareAddr.String(),
+			LinkType:       s.encapTypeToLinkType(link.Attrs().EncapType),
+			LinkSpeed:      s.networkHelper.GetNetDevLinkSpeed(pfNetName),
+			LinkAdminState: s.networkHelper.GetNetDevLinkAdminState(pfNetName),
 		}
 
 		pfStatus, exist, err := storeManager.LoadPfsStatus(iface.PciAddress)