Merge pull request #199 from pliurh/test

Choose supported NIC models for conformance test
k8snetworkplumbingwg · Nov 2, 2021 · 26eef0d · 26eef0d
2 parents 3dfb500 + 6e192b7
commit 26eef0d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/util/cluster/cluster.go b/test/util/cluster/cluster.go
@@ -136,7 +136,7 @@ func (n *EnabledNodes) FindSriovDevices(node string) ([]*sriovv1.InterfaceExt, e
 func (n *EnabledNodes) FindOneVfioSriovDevice() (string, sriovv1.InterfaceExt) {
 	for _, node := range n.Nodes {
 		for _, nic := range n.States[node].Status.Interfaces {
-			if nic.Vendor == intelVendorID {
+			if nic.Vendor == intelVendorID && sriovv1.IsSupportedModel(nic.Vendor, nic.DeviceID) {
 				return node, nic
 			}
 		}
@@ -158,7 +158,7 @@ func (n *EnabledNodes) FindOneMellanoxSriovDevice(node string) (*sriovv1.Interfa
 	}
 
 	for _, itf := range s.Status.Interfaces {
-		if itf.Vendor == mlxVendorID {
+		if itf.Vendor == mlxVendorID && sriovv1.IsSupportedModel(itf.Vendor, itf.DeviceID) {
 			return &itf, nil
 		}
 	}