From 33bb9a1d7d7ce96b7060c6a9ceedbc92518d00b7 Mon Sep 17 00:00:00 2001 From: Malte <140147670+umswmayj@users.noreply.github.com> Date: Thu, 20 Aug 2026 13:56:31 +0200 Subject: [PATCH] fix: quota hw version key in extraSpecs Signed-off-by: Malte <140147670+umswmayj@users.noreply.github.com> --- internal/scheduling/nova/integration_test.go | 2 +- .../nova/plugins/filters/filter_has_enough_capacity.go | 2 +- .../nova/plugins/filters/filter_has_enough_capacity_test.go | 2 +- .../scheduling/nova/plugins/filters/filter_quota_enforcement.go | 2 +- .../nova/plugins/filters/filter_quota_enforcement_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/scheduling/nova/integration_test.go b/internal/scheduling/nova/integration_test.go index 1b84601a7..64a9bb35a 100644 --- a/internal/scheduling/nova/integration_test.go +++ b/internal/scheduling/nova/integration_test.go @@ -142,7 +142,7 @@ func newNovaRequest(instanceUUID, projectID, flavorName, flavorGroup string, vcp extraSpecs := map[string]string{ "capabilities:hypervisor_type": "qemu", - "hw_version": flavorGroup, + "quota:hw_version": flavorGroup, } var schedulerHints map[string]any diff --git a/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity.go b/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity.go index a66166fa4..7bcdf614c 100644 --- a/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity.go +++ b/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity.go @@ -166,7 +166,7 @@ func (s *FilterHasEnoughCapacity) Run(traceLog *slog.Logger, request api.Externa // For committed resource reservations: unlock resources only if: // 1. Project ID matches // 2. ResourceGroup matches the flavor's hw_version - reservation.Spec.CommittedResourceReservation.MatchesGroup(request.Spec.Data.ProjectID, request.Spec.Data.Flavor.Data.ExtraSpecs["hw_version"]): + reservation.Spec.CommittedResourceReservation.MatchesGroup(request.Spec.Data.ProjectID, request.Spec.Data.Flavor.Data.ExtraSpecs["quota:hw_version"]): traceLog.Info("unlocking resources reserved by matching committed resource reservation with allocation", "reservation", reservation.Name, "instanceUUID", request.Spec.Data.InstanceUUID, diff --git a/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity_test.go b/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity_test.go index b1b659e59..dea74d093 100644 --- a/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity_test.go +++ b/internal/scheduling/nova/plugins/filters/filter_has_enough_capacity_test.go @@ -262,7 +262,7 @@ func newNovaRequestWithIntent(instanceUUID, projectID, flavorName, flavorGroup s extraSpecs := map[string]string{ "capabilities:hypervisor_type": "qemu", - "hw_version": flavorGroup, + "quota:hw_version": flavorGroup, } var schedulerHints map[string]any diff --git a/internal/scheduling/nova/plugins/filters/filter_quota_enforcement.go b/internal/scheduling/nova/plugins/filters/filter_quota_enforcement.go index 2278d526f..9f84d80cb 100644 --- a/internal/scheduling/nova/plugins/filters/filter_quota_enforcement.go +++ b/internal/scheduling/nova/plugins/filters/filter_quota_enforcement.go @@ -112,7 +112,7 @@ func (s *FilterQuotaEnforcement) Run(traceLog *slog.Logger, request api.External // field is in the trace log. projectID := request.Spec.Data.ProjectID az := request.Spec.Data.AvailabilityZone - hwVersion := request.Spec.Data.Flavor.Data.ExtraSpecs["hw_version"] + hwVersion := request.Spec.Data.Flavor.Data.ExtraSpecs["quota:hw_version"] if projectID == "" { traceLog.Warn("no project ID in request, skipping quota enforcement") diff --git a/internal/scheduling/nova/plugins/filters/filter_quota_enforcement_test.go b/internal/scheduling/nova/plugins/filters/filter_quota_enforcement_test.go index 688b5381d..2960cc71b 100644 --- a/internal/scheduling/nova/plugins/filters/filter_quota_enforcement_test.go +++ b/internal/scheduling/nova/plugins/filters/filter_quota_enforcement_test.go @@ -27,7 +27,7 @@ func makeQuotaEnforcementRequest(projectID, az, hwVersion string, memoryMB, numI VCPUs: 4, } if hwVersion != "" { - flavor.ExtraSpecs = map[string]string{"hw_version": hwVersion} + flavor.ExtraSpecs = map[string]string{"quota:hw_version": hwVersion} } else { flavor.ExtraSpecs = map[string]string{} }