Fix comments for aws

Signed-off-by: Sebastian Sch <[email protected]>

Author: SchSeba

Makefile

@@ -109,7 +109,7 @@ manifests: controller-gen
 check-manifests: manifests
 	@set +e; git diff --quiet config; \
 	if [ $$? -eq 1 ]; \
-	then echo -e "\n`config` folder is out of date. Please run `make manifests` and commit your changes"; \
+	then echo -e "'config' folder is out of date. Please run 'make manifests' and commit your changes"; \
 	exit 1; fi
 
 sync-manifests-%: manifests

api/v1/helper.go

@@ -55,13 +55,7 @@ var NicIDMap = []string{}
 
 var InitialState SriovNetworkNodeState
 
-// NetFilterType Represents the NetFilter tags to be used
-type NetFilterType int
-
 const (
-	// OpenstackNetworkID network UUID
-	OpenstackNetworkID NetFilterType = iota
-
 	SupportedNicIDConfigmap = "supported-nic-ids"
 )
 
@@ -72,15 +66,6 @@ const (
 	SystemdConfigurationMode ConfigurationModeType = "systemd"
 )
 
-func (e NetFilterType) String() string {
-	switch e {
-	case OpenstackNetworkID:
-		return "openstack/NetworkID"
-	default:
-		return fmt.Sprintf("%d", int(e))
-	}
-}
-
 func InitNicIDMapFromConfigMap(client kubernetes.Interface, namespace string) error {
 	cm, err := client.CoreV1().ConfigMaps(namespace).Get(
 		context.Background(),

api/v1/sriovnetworknodepolicy_types.go

@@ -76,7 +76,10 @@ type SriovNetworkNicSelector struct {
 	RootDevices []string `json:"rootDevices,omitempty"`
 	// Name of SR-IoV PF.
 	PfNames []string `json:"pfNames,omitempty"`
-	// Infrastructure Networking selection filter. Allowed value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+	// Infrastructure Networking selection filter.
+	// Allowed values:
+	// - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+	// - "aws/NetworkID:xxxxxxxx"
 	NetFilter string `json:"netFilter,omitempty"`
 }
 

cmd/sriov-network-config-daemon/start.go

@@ -244,12 +244,8 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
 		setupLog.Error(err, "failed to fetch node state, exiting", "node-name", startOpts.nodeName)
 		return err
 	}
-	// check for a platform
-	for key, pType := range vars.PlatformsMap {
-		if strings.Contains(strings.ToLower(nodeInfo.Spec.ProviderID), strings.ToLower(key)) {
-			vars.PlatformType = pType
-		}
-	}
+	// set the platform type
+	vars.PlatformType = vars.GetPlatformType(nodeInfo.Spec.ProviderID)
 	setupLog.Info("Running on", "platform", vars.PlatformType)
 
 	// create helpers

config/crd/bases/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

@@ -161,8 +161,11 @@ spec:
                       "0d58", "1572", "158b", "1013", "1015", "1017", "101b".
                     type: string
                   netFilter:
-                    description: Infrastructure Networking selection filter. Allowed
-                      value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                    description: |-
+                      Infrastructure Networking selection filter.
+                      Allowed values:
+                      - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                      - "aws/NetworkID:xxxxxxxx"
                     type: string
                   pfNames:
                     description: Name of SR-IoV PF.

deployment/sriov-network-operator-chart/crds/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml

@@ -161,8 +161,11 @@ spec:
                       "0d58", "1572", "158b", "1013", "1015", "1017", "101b".
                     type: string
                   netFilter:
-                    description: Infrastructure Networking selection filter. Allowed
-                      value "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                    description: |-
+                      Infrastructure Networking selection filter.
+                      Allowed values:
+                      - "openstack/NetworkID:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+                      - "aws/NetworkID:xxxxxxxx"
                     type: string
                   pfNames:
                     description: Name of SR-IoV PF.

pkg/host/internal/sriov/sriov.go

@@ -208,6 +208,15 @@ func (s *sriov) SetVfAdminMac(vfAddr string, pfLink, vfLink netlink.Link) error
 	return nil
 }
 
+// getDeviceClass parses the device class from the device
+func getDeviceClass(device *ghw.PCIDevice) (int64, error) {
+	devClass, err := strconv.ParseInt(device.Class.ID, 16, 64)
+	if err != nil {
+		return 0, fmt.Errorf("unable to parse device class: %v", err)
+	}
+	return devClass, nil
+}
+
 func (s *sriov) DiscoverSriovDevices(storeManager store.ManagerInterface) ([]sriovnetworkv1.InterfaceExt, error) {
 	log.Log.V(2).Info("DiscoverSriovDevices")
 	pfList := []sriovnetworkv1.InterfaceExt{}
@@ -223,7 +232,7 @@ func (s *sriov) DiscoverSriovDevices(storeManager store.ManagerInterface) ([]sri
 	}
 
 	for _, device := range devices {
-		devClass, err := strconv.ParseInt(device.Class.ID, 16, 64)
+		devClass, err := getDeviceClass(device)
 		if err != nil {
 			log.Log.Error(err, "DiscoverSriovDevices(): unable to parse device class, skipping",
 				"device", device)
@@ -326,7 +335,7 @@ func (s *sriov) DiscoverSriovVirtualDevices() ([]sriovnetworkv1.InterfaceExt, er
 	}
 
 	for _, device := range devices {
-		devClass, err := strconv.ParseInt(device.Class.ID, 16, 64)
+		devClass, err := getDeviceClass(device)
 		if err != nil {
 			log.Log.Error(err, "DiscoverSriovVirtualDevices(): unable to parse device class for device, skipping",
 				"device", device)
@@ -915,25 +924,30 @@ func (s *sriov) ConfigSriovDevicesVirtual(storeManager store.ManagerInterface, i
 					"numVfs", ifaceToConfigure.Iface.NumVfs)
 				return errors.New("NumVfs > 1")
 			}
+			// Validate the VFGroups we need to have only one VFGroup
 			if len(ifaceToConfigure.Iface.VfGroups) != 1 {
-				log.Log.Error(nil, "ConfigSriovDeviceVirtual(): missing VFGroup")
-				return errors.New("NumVfs != 1")
+				log.Log.Error(nil, "ConfigSriovDeviceVirtual(): unexpected number of VFGroups", "vfGroups", ifaceToConfigure.Iface.VfGroups)
+				return errors.New("unexpected number of VFGroups")
 			}
+
 			addr := ifaceToConfigure.Iface.PciAddress
-			log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "address", addr)
+			log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "pciAddress", addr)
 			driver := ""
 			vfID := 0
-			for _, group := range ifaceToConfigure.Iface.VfGroups {
-				log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "group", group)
-				if sriovnetworkv1.IndexInRange(vfID, group.VfRange) {
-					log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "indexInRange", vfID)
-					if sriovnetworkv1.StringInArray(group.DeviceType, vars.DpdkDrivers) {
-						log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "driver", group.DeviceType)
-						driver = group.DeviceType
-					}
-					break
-				}
+
+			group := ifaceToConfigure.Iface.VfGroups[0]
+			// Validate the VF ID is in the range for the VFGroup
+			if !sriovnetworkv1.IndexInRange(vfID, group.VfRange) {
+				log.Log.Error(nil, "ConfigSriovDeviceVirtual(): VF ID is not in the range", "vfID", vfID, "vfRange", group.VfRange)
+				return errors.New("VF ID is not in the range")
 			}
+
+			// check if we need to bind to a DPDK driver
+			if sriovnetworkv1.StringInArray(group.DeviceType, vars.DpdkDrivers) {
+				log.Log.V(2).Info("ConfigSriovDeviceVirtual()", "driver", group.DeviceType)
+				driver = group.DeviceType
+			}
+
 			if driver == "" {
 				log.Log.V(2).Info("ConfigSriovDeviceVirtual(): bind default")
 				if err := s.kernelHelper.BindDefaultDriver(addr); err != nil {

pkg/host/internal/sriov/sriov_test.go

@@ -1171,7 +1171,7 @@ var _ = Describe("SRIOV", func() {
 					LinkAdminState: "down",
 				}})
 			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring("NumVfs != 1"))
+			Expect(err.Error()).To(ContainSubstring("unexpected number of VFGroups"))
 		})
 
 		It("should fail when BindDefaultDriver fails", func() {
@@ -1423,10 +1423,7 @@ var _ = Describe("SRIOV", func() {
 				}})).NotTo(HaveOccurred())
 		})
 
-		It("should configure with default driver when VfRange doesn't include vfID 0", func() {
-			hostMock.EXPECT().BindDefaultDriver("0000:d8:00.0").Return(nil)
-			storeManagerMode.EXPECT().SaveLastPfAppliedStatus(gomock.Any()).Return(nil)
-
+		It("should return error when VfRange doesn't include vfID 0", func() {
 			Expect(s.ConfigSriovDevicesVirtual(storeManagerMode,
 				[]sriovnetworkv1.Interface{{
 					Name:       "enp216s0f0np0",
@@ -1443,7 +1440,7 @@ var _ = Describe("SRIOV", func() {
 					PciAddress:     "0000:d8:00.0",
 					NumVfs:         1,
 					LinkAdminState: "down",
-				}})).NotTo(HaveOccurred())
+				}})).To(HaveOccurred())
 		})
 
 		It("should configure with default driver when DeviceType is not a DPDK driver", func() {
@@ -1492,30 +1489,6 @@ var _ = Describe("SRIOV", func() {
 				}})).NotTo(HaveOccurred())
 		})
 
-		It("should configure when EswitchMode needs update", func() {
-			hostMock.EXPECT().BindDpdkDriver("0000:d8:00.0", "vfio-pci").Return(nil)
-			storeManagerMode.EXPECT().SaveLastPfAppliedStatus(gomock.Any()).Return(nil)
-
-			Expect(s.ConfigSriovDevicesVirtual(storeManagerMode,
-				[]sriovnetworkv1.Interface{{
-					Name:        "enp216s0f0np0",
-					PciAddress:  "0000:d8:00.0",
-					NumVfs:      1,
-					EswitchMode: "switchdev",
-					VfGroups: []sriovnetworkv1.VfGroup{{
-						VfRange:      "0-0",
-						ResourceName: "test-resource0",
-						PolicyName:   "test-policy0",
-						DeviceType:   "vfio-pci",
-					}},
-				}},
-				[]sriovnetworkv1.InterfaceExt{{
-					PciAddress:  "0000:d8:00.0",
-					NumVfs:      1,
-					EswitchMode: "legacy",
-				}})).NotTo(HaveOccurred())
-		})
-
 		It("should configure when LinkAdminState is down", func() {
 			hostMock.EXPECT().BindDefaultDriver("0000:d8:00.0").Return(nil)
 			storeManagerMode.EXPECT().SaveLastPfAppliedStatus(gomock.Any()).Return(nil)