DRA: add even more allocator test cases

Author: bart0sh

staging/src/k8s.io/dynamic-resource-allocation/structured/allocator_test.go

@@ -200,6 +200,9 @@ func TestAllocator(t *testing.T) {
 	// 		},
 	// 	},
 	// }
+
+	// Slices
+
 	node1slice := unmarshal[resourceapi.ResourceSlice](t, `
 metadata:
   name: worker-1-slice
@@ -218,6 +221,10 @@ spec:
           version: 1.0.0
         numa:
           int: 1
+        stringAttribute:
+          string: stringAttributeValue
+        boolAttribute:
+          bool: true
       capacity:
         memory: 1Gi # small
   - name: device-2
@@ -227,6 +234,10 @@ spec:
           version: 1.0.0
         numa:
           int: 1
+        stringAttribute:
+          string: stringAttributeValue
+        boolAttribute:
+          bool: true
       capacity:
         memory: 2Gi # large
 `)
@@ -247,18 +258,26 @@ spec:
     basic:
       attributes:
         driverVersion:
-          version: 1.0.0
+          version: 2.0.0
         numa:
-          int: 1
+          int: 2
+        stringAttribute:
+          string: stringAttributeValue2
+        boolAttribute:
+          bool: false
       capacity:
         memory: 1Gi # small
   - name: device-6
     basic:
       attributes:
         driverVersion:
-          version: 1.0.0
+          version: 2.0.0
         numa:
-          int: 1
+          int: 2
+        stringAttribute:
+          string: stringAttributeValue2
+        boolAttribute:
+          bool: false
       capacity:
         memory: 2Gi # large
 `)
@@ -424,7 +443,7 @@ spec:
     basic:
       attributes:
         driverVersion:
-          version: 1.0.0
+          version: 2.0.0
         numa:
           int: 1
       capacity:
@@ -433,13 +452,15 @@ spec:
     basic:
       attributes:
         driverVersion:
-          version: 1.0.0
+          version: 2.0.0
         numa:
           int: 1
       capacity:
         memory: 2Gi # large
 `)
 
+	// Claims
+
 	simpleClaim := unmarshal[resourceapi.ResourceClaim](t, `
 metadata:
   name: claim
@@ -480,6 +501,30 @@ spec:
         parameters: {"deviceAttribute":"deviceAttributeValue"}
 `)
 
+	simpleClaimWithUnknownClassName := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 1
+      deviceClassName: unknown-class
+`)
+
+	simpleClaimWithEmptyClassName := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 1
+      deviceClassName: ""
+`)
+
 	allocatedSimpleClaim := unmarshal[resourceapi.AllocationResult](t, `
 devices:
   results:
@@ -607,6 +652,83 @@ spec:
           expression: device.capacity["driver-a"].memory.compareTo(quantity("2Gi")) >= 0
 `)
 
+	twoDeviceClaimWithConstraint := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 1
+      deviceClassName: driver-a
+    - name: req-1
+      countMode: Exact
+      count: 1
+      deviceClassName: driver-a
+    constraints:
+    - matchAttribute: numa
+    - matchAttribute: driverVersion
+    - matchAttribute: stringAttribute
+    - matchAttribute: boolAttribute
+`)
+
+	claimWithConstraintNotMatchingIntAttribute := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 3
+      deviceClassName: driver-a
+    constraints:
+    - matchAttribute: numa
+`)
+
+	claimWithConstraintNotMatchingVersionAttribute := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 3
+      deviceClassName: driver-a
+    constraints:
+    - matchAttribute: driverVersion	
+`)
+
+	claimWithConstraintNotMatchingStringAttribute := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 3
+      deviceClassName: driver-a
+    constraints:
+    - matchAttribute: stringAttribute	
+`)
+
+	claimWithConstraintNotMatchingBoolAttribute := unmarshal[resourceapi.ResourceClaim](t, `
+metadata:
+  name: claim
+spec:
+  devices:
+    requests:
+    - name: req-0
+      countMode: Exact
+      count: 3
+      deviceClassName: driver-a
+    constraints:
+    - matchAttribute: boolAttribute
+`)
+
 	fourDeviceClaim := unmarshal[resourceapi.ResourceClaim](t, `
 metadata:
   name: claim
@@ -646,21 +768,7 @@ spec:
           expression: device.capacity["driver-a"].memory.compareTo(quantity("1Gi")) >= 0
 `)
 
-	simpleClaimWithConstraint := unmarshal[resourceapi.ResourceClaim](t, `
-metadata:
-  name: claim
-spec:
-  devices:
-    requests:
-    - name: req-0
-      countMode: Exact
-      count: 1
-      deviceClassName: driver-a
-    constraints:
-    - matchAttribute: numa
-`)
-
-	simpleClaimWithConstraintUnsatisfiable := unmarshal[resourceapi.ResourceClaim](t, `
+	simpleClaimWithConstraintNonExistentAttribute := unmarshal[resourceapi.ResourceClaim](t, `
 metadata:
   name: claim
 spec:
@@ -671,7 +779,7 @@ spec:
       count: 1
       deviceClassName: driver-a
     constraints:
-    - matchAttribute: doesnotexist
+    - matchAttribute: NonExistentAttribute
 `)
 
 	allocatedTwoDeviceClaim := unmarshal[resourceapi.AllocationResult](t, `
@@ -800,6 +908,24 @@ devices:
 			expectResults: nil,
 			expectError:   gomega.MatchError(gomega.ContainSubstring("could not retrieve device class driver-a")),
 		},
+		"unknown class": {
+			claimsToAllocate: objects(simpleClaimWithUnknownClassName),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1DriverBslice),
+			node:             node1,
+
+			expectResults: nil,
+			expectError:   gomega.MatchError(gomega.ContainSubstring("could not retrieve device class unknown-class")),
+		},
+		"empty class": {
+			claimsToAllocate: objects(simpleClaimWithEmptyClassName),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1DriverBslice),
+			node:             node1,
+
+			expectResults: nil,
+			expectError:   gomega.MatchError(gomega.ContainSubstring("claim claim, request req-0: unsupported request type")),
+		},
 		"no claims to allocate": {
 			claimsToAllocate: nil,
 			classes:          objects(driverAClass),
@@ -874,18 +1000,50 @@ devices:
 
 			expectResults: nil,
 		},
-		"with constaint": {
-			claimsToAllocate: objects(simpleClaimWithConstraint),
+		"with constraint": {
+			claimsToAllocate: objects(twoDeviceClaimWithConstraint),
 			classes:          objects(driverAClass),
 			slices:           objects(node1slice),
 			node:             node1,
 
-			expectResults: []any{allocatedSimpleClaim},
+			expectResults: []any{allocatedTwoDeviceClaim},
 		},
-		"with unsatisfiable constaint": {
-			claimsToAllocate: objects(simpleClaimWithConstraintUnsatisfiable),
+		"with constraint: non-existent attribute": {
+			claimsToAllocate: objects(simpleClaimWithConstraintNonExistentAttribute),
 			classes:          objects(driverAClass),
-			slices:           objects(node1slice2),
+			slices:           objects(node1slice),
+			node:             node1,
+
+			expectResults: nil,
+		},
+		"with constraint: not matching int attribute": {
+			claimsToAllocate: objects(claimWithConstraintNotMatchingIntAttribute),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1slice2),
+			node:             node1,
+
+			expectResults: nil,
+		},
+		"with constraint: not matching version attribute": {
+			claimsToAllocate: objects(claimWithConstraintNotMatchingVersionAttribute),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1slice2),
+			node:             node1,
+
+			expectResults: nil,
+		},
+		"with constraint: not matching string attribute": {
+			claimsToAllocate: objects(claimWithConstraintNotMatchingStringAttribute),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1slice2),
+			node:             node1,
+
+			expectResults: nil,
+		},
+		"with constraint: not matching bool attribute": {
+			claimsToAllocate: objects(claimWithConstraintNotMatchingBoolAttribute),
+			classes:          objects(driverAClass, driverBClass),
+			slices:           objects(node1slice, node1slice2),
 			node:             node1,
 
 			expectResults: nil,