update scheduler changes

Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>

Author: britaniar

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.9.11
 	github.com/google/go-cmp v0.7.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
+	github.com/kubefleet-dev/kubefleet v0.0.1
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
 	github.com/prometheus/client_golang v1.22.0

go.sum

@@ -201,6 +201,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kubefleet-dev/kubefleet v0.0.1 h1:Xo/DvRlKq7YLvzjGp8GFD8G6SLAyI41l4Sw4+df534g=
+github.com/kubefleet-dev/kubefleet v0.0.1/go.mod h1:EXicokCzLknCzcpQ/8ehtXqBokr0/xUfzsSsU++rReY=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=

pkg/clients/azure/compute/vmsizerecommenderclient_test.go

@@ -7,18 +7,15 @@ package compute
 
 import (
 	"context"
-	"fmt"
-	"io"
 	"net/http"
-	"net/http/httptest"
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 
 	computev1 "go.goms.io/fleet/apis/protos/azure/compute/v1"
+	computeUtils "go.goms.io/fleet/test/utils/compute"
 )
 
 func TestNewAttributeBasedVMSizeRecommenderClient(t *testing.T) {
@@ -205,50 +202,7 @@ func TestClient_GenerateAttributeBasedRecommendations(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create mock server
-			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				// Verify request method
-				if r.Method != http.MethodPost {
-					t.Errorf("got %s, want POST request", r.Method)
-				}
-
-				// Verify headers
-				if r.Header.Get("Content-Type") != "application/json" {
-					t.Errorf("got %s, want Content-Type: application/json", r.Header.Get("Content-Type"))
-				}
-				if r.Header.Get("Accept") != "application/json" {
-					t.Errorf("got %s, want Accept: application/json", r.Header.Get("Accept"))
-				}
-
-				// Verify URL path if request is not nil
-				if tt.request != nil && tt.request.SubscriptionId != "" && tt.request.Location != "" {
-					wantPath := fmt.Sprintf(recommendationsPathTemplate, tt.request.SubscriptionId, tt.request.Location)
-					if r.URL.Path != wantPath {
-						t.Errorf("got %s, want path %s", r.URL.Path, wantPath)
-					}
-
-					// Verify request body using protojson for proper proto3 oneof support
-					body, err := io.ReadAll(r.Body)
-					if err != nil {
-						t.Fatalf("failed to read request body: %v", err)
-					}
-					var req computev1.GenerateAttributeBasedRecommendationsRequest
-					unmarshaler := protojson.UnmarshalOptions{
-						DiscardUnknown: true,
-					}
-					if err := unmarshaler.Unmarshal(body, &req); err != nil {
-						t.Fatalf("failed to unmarshal request body: %v", err)
-					}
-					if !proto.Equal(tt.request, &req) {
-						t.Errorf("request body mismatch: got %+v, want %+v", &req, tt.request)
-					}
-				}
-
-				// Write mock response
-				w.WriteHeader(tt.mockStatusCode)
-				if _, err := w.Write([]byte(tt.mockResponse)); err != nil {
-					t.Fatalf("failed to write response: %v", err)
-				}
-			}))
+			server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, tt.request, tt.mockResponse, tt.mockStatusCode)
 			defer server.Close()
 
 			// Create client

pkg/propertychecker/azure/checker_test.go

@@ -16,8 +16,8 @@ import (
 	placementv1beta1 "go.goms.io/fleet/apis/placement/v1beta1"
 	"go.goms.io/fleet/pkg/clients/azure/compute"
 	"go.goms.io/fleet/pkg/propertyprovider/azure"
-	"go.goms.io/fleet/pkg/utils"
 	"go.goms.io/fleet/pkg/utils/labels"
+	computeUtils "go.goms.io/fleet/test/utils/compute"
 )
 
 func TestValidateCapacity(t *testing.T) {
@@ -301,6 +301,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 		name           string
 		cluster        *clusterv1beta1.MemberCluster
 		sku            string
+		targetCapacity uint32
 		req            placementv1beta1.PropertySelectorRequirement
 		mockStatusCode int
 		wantAvailable  bool
@@ -311,15 +312,17 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "valid capacity request",
 			cluster:        cluster,
 			sku:            validSKU,
+			targetCapacity: 3,
 			req:            validPropertySelectorRequirement,
 			mockStatusCode: http.StatusOK,
 			wantAvailable:  true,
 			wantError:      false,
 		},
 		{
-			name:    "unavailable SKU request",
-			cluster: cluster,
-			sku:     "Standard_D2s_v4",
+			name:           "unavailable SKU request",
+			cluster:        cluster,
+			sku:            "Standard_D2s_v4",
+			targetCapacity: 1,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, "Standard_D2s_v4"),
 				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
@@ -339,6 +342,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 				},
 			},
 			sku:            validSKU,
+			targetCapacity: 3,
 			req:            validPropertySelectorRequirement,
 			wantError:      true,
 			errorSubstring: "failed to extract Azure location label from cluster : label \"fleet.azure.com/location\" not found in cluster",
@@ -353,6 +357,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 				},
 			},
 			sku:            validSKU,
+			targetCapacity: 3,
 			req:            validPropertySelectorRequirement,
 			wantError:      true,
 			errorSubstring: "failed to extract Azure location label from cluster",
@@ -367,6 +372,7 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 				},
 			},
 			sku:            validSKU,
+			targetCapacity: 3,
 			req:            validPropertySelectorRequirement,
 			wantError:      true,
 			errorSubstring: "failed to extract Azure subscription ID label from cluster",
@@ -375,28 +381,31 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			name:           "Azure API returns error",
 			cluster:        cluster,
 			sku:            validSKU,
+			targetCapacity: 3,
 			req:            validPropertySelectorRequirement,
 			mockStatusCode: http.StatusInternalServerError,
 			wantError:      true,
 			errorSubstring: "failed to generate VM size recommendations from Azure",
 		},
 		{
-			name:    "invalid operator in requirement",
-			cluster: cluster,
-			sku:     validSKU,
+			name:           "invalid operator in requirement",
+			cluster:        cluster,
+			sku:            validSKU,
+			targetCapacity: 2,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, validSKU),
 				Operator: placementv1beta1.PropertySelectorEqualTo,
-				Values:   []string{"3"},
+				Values:   []string{"2"},
 			},
 			mockStatusCode: http.StatusOK,
 			wantError:      true,
 			errorSubstring: "unsupported operator \"Eq\" for SKU capacity property, only GreaterThan (Gt) and GreaterThanOrEqualTo (Ge) are supported",
 		},
 		{
-			name:    "unsupported operator in requirement",
-			cluster: cluster,
-			sku:     validSKU,
+			name:           "unsupported operator in requirement",
+			cluster:        cluster,
+			sku:            validSKU,
+			targetCapacity: 0,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, validSKU),
 				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
@@ -407,9 +416,10 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 			errorSubstring: "capacity value cannot be zero for operator",
 		},
 		{
-			name:    "cases-insensitive request - unavailable SKU",
-			cluster: cluster,
-			sku:     "STANDARD_D2S_V3",
+			name:           "cases-insensitive request - unavailable SKU",
+			cluster:        cluster,
+			sku:            "STANDARD_D2S_V3",
+			targetCapacity: 1,
 			req: placementv1beta1.PropertySelectorRequirement{
 				Name:     fmt.Sprintf(azure.CapacityPerSKUPropertyTmpl, "STANDARD_D2S_V3"),
 				Operator: placementv1beta1.PropertySelectorGreaterThanOrEqualTo,
@@ -423,7 +433,8 @@ func TestCheckIfMeetSKUCapacityRequirement(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create mock server.
-			server := utils.CreateMockAttributeBasedVMSizeRecommenderServer(t, tt.mockStatusCode)
+			mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tt.cluster.Labels[labels.AzureSubscriptionIDLabel], tt.cluster.Labels[labels.AzureLocationLabel], tt.sku, tt.targetCapacity)
+			server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, tt.mockStatusCode)
 			defer server.Close()
 
 			client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)

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

@@ -61,6 +61,7 @@ func (p *Plugin) Filter(
 		t := &ps.GetPolicySnapshotSpec().Policy.Affinity.ClusterAffinity.RequiredDuringSchedulingIgnoredDuringExecution.ClusterSelectorTerms[idx]
 		r := clusterRequirement{
 			ClusterSelectorTerm: *t,
+			PropertyChecker:     p.PropertyChecker,
 		}
 		isMatched, err := r.Matches(cluster)
 		if err != nil {

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

@@ -35,8 +35,8 @@ import (
 	"go.goms.io/fleet/pkg/propertyprovider"
 	"go.goms.io/fleet/pkg/propertyprovider/azure"
 	"go.goms.io/fleet/pkg/scheduler/framework"
-	"go.goms.io/fleet/pkg/utils"
 	"go.goms.io/fleet/pkg/utils/labels"
+	computeUtils "go.goms.io/fleet/test/utils/compute"
 )
 
 const (
@@ -756,6 +756,35 @@ func TestFilter(t *testing.T) {
 			},
 			wantStatus: framework.NewNonErrorStatus(framework.ClusterUnschedulable, p.Name(), "cluster does not match with any of the required cluster affinity terms"),
 		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ctx := context.Background()
+			state := framework.NewCycleState(nil, nil, nil)
+			status := p.Filter(ctx, state, tc.ps, tc.cluster)
+
+			if diff := cmp.Diff(
+				status, tc.wantStatus,
+				cmp.AllowUnexported(framework.Status{}),
+				ignoreStatusErrorField,
+			); diff != "" {
+				t.Errorf("Filter() unexpected status (-got, +want):\n%s", diff)
+			}
+		})
+	}
+}
+
+func TestFilter_PropertyChecker(t *testing.T) {
+	// This test ensures that the property checker is invoked correctly.
+	testCases := []struct {
+		name           string
+		ps             *placementv1beta1.ClusterSchedulingPolicySnapshot
+		cluster        *clusterv1beta1.MemberCluster
+		vmSize         string
+		targetCapacity uint32
+		wantStatus     *framework.Status
+	}{
 		{
 			name: "single cluster capacity based term, matched",
 			ps: &placementv1beta1.ClusterSchedulingPolicySnapshot{
@@ -800,6 +829,8 @@ func TestFilter(t *testing.T) {
 					},
 				},
 			},
+			vmSize:         "Standard_D2s_v3",
+			targetCapacity: 1,
 		},
 		{
 			name: "single cluster capacity based term, not matched",
@@ -845,21 +876,23 @@ func TestFilter(t *testing.T) {
 					},
 				},
 			},
-			wantStatus: framework.NewNonErrorStatus(framework.ClusterUnschedulable, p.Name(), "cluster does not match with any of the required cluster affinity terms"),
+			vmSize:         "Standard_B2ms",
+			targetCapacity: 3,
+			wantStatus:     framework.NewNonErrorStatus(framework.ClusterUnschedulable, p.Name(), "cluster does not match with any of the required cluster affinity terms"),
 		},
 	}
-
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			// Create mock server
-			server := utils.CreateMockAttributeBasedVMSizeRecommenderServer(t, http.StatusOK)
+			mockRequest := computeUtils.GenerateMockAttributeBasedVMSizeRecommenderRequest(tc.cluster.Labels[labels.AzureSubscriptionIDLabel], tc.cluster.Labels[labels.AzureLocationLabel], tc.vmSize, tc.targetCapacity)
+			server := computeUtils.CreateMockAttributeBasedVMSizeRecommenderServer(t, mockRequest, computeUtils.MockAttributeBasedVMSizeRecommenderResponse, http.StatusOK)
 			defer server.Close()
 
 			client, err := compute.NewAttributeBasedVMSizeRecommenderClient(server.URL, http.DefaultClient)
 			if err != nil {
 				t.Fatalf("failed to create VM size recommender client: %v", err)
 			}
-			p.propertyChecker = checker.NewPropertyChecker(*client)
+			p.PropertyChecker = checker.NewPropertyChecker(*client)
 
 			ctx := context.Background()
 			state := framework.NewCycleState(nil, nil, nil)

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

@@ -33,8 +33,9 @@ type Plugin struct {
 	// The framework handle.
 	handle framework.Handle
 
-	// Optional property checker for SKU validation.
-	propertyChecker *azure.PropertyChecker
+	// Optional PropertyChecker for validating properties not provided by the property provider.
+	// Currently only supports checking SKU capacity, but can support additional property checks.
+	PropertyChecker *azure.PropertyChecker
 }
 
 var (
@@ -58,8 +59,8 @@ type clusterAffinityPluginOptions struct {
 	// The name of the plugin.
 	name string
 
-	// Optional property checker for SKU validation.
-	propertyChecker *azure.PropertyChecker
+	// The PropertyChecker of the plugin.
+	PropertyChecker *azure.PropertyChecker
 }
 
 type Option func(*clusterAffinityPluginOptions)
@@ -79,7 +80,7 @@ func WithName(name string) Option {
 // This enables specific cluster requirement validation.
 func WithPropertyChecker(checker *azure.PropertyChecker) Option {
 	return func(o *clusterAffinityPluginOptions) {
-		o.propertyChecker = checker
+		o.PropertyChecker = checker
 	}
 }
 
@@ -92,7 +93,7 @@ func New(opts ...Option) Plugin {
 
 	return Plugin{
 		name:            options.name,
-		propertyChecker: options.propertyChecker,
+		PropertyChecker: options.PropertyChecker,
 	}
 }
 

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

@@ -28,6 +28,7 @@ import (
 
 	clusterv1beta1 "go.goms.io/fleet/apis/cluster/v1beta1"
 	placementv1beta1 "go.goms.io/fleet/apis/placement/v1beta1"
+	"go.goms.io/fleet/pkg/propertychecker/azure"
 	"go.goms.io/fleet/pkg/propertyprovider"
 )
 
@@ -36,6 +37,9 @@ import (
 type clusterRequirement struct {
 	// Embed the original ClusterSelectorTerm.
 	ClusterSelectorTerm placementv1beta1.ClusterSelectorTerm
+
+	// Optional PropertyChecker for validating properties not provided by the property provider.
+	PropertyChecker *azure.PropertyChecker
 }
 
 // retrieveResourceUsageFrom retrieves a resource property value from a member cluster.