fix capcity value adjustment and tests

Signed-off-by: Britania Rodriguez Reyes <[email protected]>

Author: britaniar

pkg/propertychecker/azure/checker.go

@@ -153,14 +153,17 @@ func validateCapacity(value string, operator placementv1beta1.PropertySelectorOp
 
 	capacity := uint32(valueUint) // capacity is >= 0 since it's parsed as uint.
 
-	// Adjust capacity based on operator semantics for VMSizeRecommender API.
-	// If operator is GreaterThanOrEqualTo, decrement capacity by 1 as the API checks for strictly greater than.
-	if operator == placementv1beta1.PropertySelectorGreaterThanOrEqualTo && capacity > minVMInstanceCapacity {
-		capacity -= 1
+	// Adjust capacity for VMSizeRecommender API semantics.
+	// The API requires requested capacity >= 1.
+	// If operator is GreaterThan (Gt) , increment the requested value by 1.
+	// Otherwise, use the requested value as-is.
+	// These adjustments ensure the API interprets the request correctly
+	if operator == placementv1beta1.PropertySelectorGreaterThan {
+		capacity += 1
 	}
 
 	// Validate against maximum allowed capacity (exceed maxVMInstanceCapacity).
-	if capacity >= maxVMInstanceCapacity {
+	if capacity > maxVMInstanceCapacity {
 		return 0, fmt.Errorf("capacity value %d exceeds maximum allowed value of %d", capacity, maxVMInstanceCapacity)
 	}
 

pkg/propertychecker/azure/checker_test.go

@@ -33,14 +33,14 @@ func TestValidateCapacity(t *testing.T) {
 			name:      "valid capacity value for GreaterThan operator",
 			value:     "10",
 			operator:  placementv1beta1.PropertySelectorGreaterThan,
-			wantValue: 10,
+			wantValue: 11,
 			wantError: false,
 		},
 		{
 			name:      "valid capacity value for GreaterThanOrEqualTo operator",
 			value:     "50",
 			operator:  placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
-			wantValue: 49,
+			wantValue: 50,
 			wantError: false,
 		},
 		{
@@ -94,7 +94,7 @@ func TestValidateCapacity(t *testing.T) {
 			name:      "capacity equal to max limit with supported operator",
 			value:     "200",
 			operator:  placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
-			wantValue: 199,
+			wantValue: 200,
 			wantError: false,
 		},
 		{
@@ -105,15 +105,15 @@ func TestValidateCapacity(t *testing.T) {
 			errorSubstring: "exceeds maximum allowed value",
 		},
 		{
-			name:      "capacity at minimum limit",
+			name:      "capacity at minimum limit (Gt)",
 			value:     "1",
 			operator:  placementv1beta1.PropertySelectorGreaterThan,
-			wantValue: 1,
+			wantValue: 2,
 			wantError: false,
 		},
 		{
-			name:      "capacity at minimum limit after adjustment",
-			value:     "2",
+			name:      "capacity at minimum limit (Ge)",
+			value:     "1",
 			operator:  placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
 			wantValue: 1,
 			wantError: false,
@@ -163,7 +163,7 @@ func TestExtractCapacityRequirements(t *testing.T) {
 				Values:   []string{"4"},
 			},
 			wantSKU:           "Standard_D4s_v3",
-			wantCapacityValue: 4,
+			wantCapacityValue: 5,
 			wantError:         false,
 		},
 		{
@@ -327,7 +327,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "valid capacity request",
 			cluster:        cluster,
 			sku:            validSKU,
-			targetCapacity: 3,
+			targetCapacity: 4,
 			req:            validPropertySelectorRequirement,
 			mockStatusCode: http.StatusOK,
 			wantAvailable:  true,
@@ -337,7 +337,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "unavailable SKU request",
 			cluster:        cluster,
 			sku:            "Standard_D2s_v4",
-			targetCapacity: 1,
+			targetCapacity: 2,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, "Standard_D2s_v4"),
 				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
@@ -396,7 +396,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "Azure API returns error",
 			cluster:        cluster,
 			sku:            validSKU,
-			targetCapacity: 3,
+			targetCapacity: 4,
 			req:            validPropertySelectorRequirement,
 			mockStatusCode: http.StatusInternalServerError,
 			wantError:      true,
@@ -433,7 +433,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "cases-insensitive request - available SKU",
 			cluster:        cluster,
 			sku:            "STANDARD_D2S_V3",
-			targetCapacity: 1,
+			targetCapacity: 2,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, "STANDARD_D2S_V3"),
 				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,

pkg/scheduler/framework/plugins/clusteraffinity/filtering_test.go

@@ -831,7 +831,7 @@ func TestFilter_PropertyChecker(t *testing.T) {
 				},
 			},
 			vmSize:         "Standard_D2s_v3",
-			targetCapacity: 1,
+			targetCapacity: 2,
 		},
 		{
 			name: "single cluster capacity based term, not matched",
@@ -878,7 +878,7 @@ func TestFilter_PropertyChecker(t *testing.T) {
 				},
 			},
 			vmSize:         "Standard_B2ms",
-			targetCapacity: 3,
+			targetCapacity: 4,
 			wantStatus:     framework.NewNonErrorStatus(framework.ClusterUnschedulable, p.Name(), "cluster does not match with any of the required cluster affinity terms"),
 		},
 	}

pkg/scheduler/framework/plugins/clusteraffinity/types_azure_test.go

@@ -124,7 +124,7 @@ func TestMatchPropertiesInPropertyChecker(t *testing.T) {
 				Values:   []string{"2"},
 			},
 			vmSize:         "Standard_D2s_v3",
-			targetCapacity: 2,
+			targetCapacity: 3,
 			wantHandled:    true,
 			wantAvailable:  true,
 		},
@@ -137,7 +137,7 @@ func TestMatchPropertiesInPropertyChecker(t *testing.T) {
 				Values:   []string{"2"},
 			},
 			vmSize:         "NonExistentSKU",
-			targetCapacity: 1,
+			targetCapacity: 2,
 			wantHandled:    true,
 			wantAvailable:  false,
 		},

pkg/scheduler/framework/plugins/clusteraffinity/types_test.go

@@ -1356,7 +1356,7 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 			},
 			cluster:        cluster,
 			sku:            "Standard_D2s_v3",
-			targetCapacity: 1,
+			targetCapacity: 2,
 			want:           true,
 		},
 		{
@@ -1388,7 +1388,7 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 			},
 			cluster:        cluster,
 			sku:            "Standard_D4s_v3",
-			targetCapacity: 8,
+			targetCapacity: 9,
 		},
 		{
 			name: "op >=, matched (max limit)",
@@ -1403,7 +1403,7 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 			},
 			cluster:        cluster,
 			sku:            "Standard_D2s_v3",
-			targetCapacity: 199,
+			targetCapacity: 200,
 			want:           true,
 		},
 		{
@@ -1419,7 +1419,7 @@ func TestClusterRequirementMatches_WithPropertyChecker(t *testing.T) {
 			},
 			cluster:        cluster,
 			sku:            "Standard_D4s_v3",
-			targetCapacity: 79,
+			targetCapacity: 80,
 		},
 	}