Merge pull request #623 from sapcc/liquid-ironic-fix-topology

liquid-ironic: report all AZs required by AZAwareResourceTopology
sapcc · Dec 11, 2024 · 6155bc1 · 6155bc1
2 parents aabca03 + 0a42123
commit 6155bc1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/internal/liquids/ironic/capacity.go b/internal/liquids/ironic/capacity.go
@@ -114,6 +114,9 @@ func (l *Logic) ScanCapacity(ctx context.Context, req liquid.ServiceCapacityRequ
 		delete(nodesByFlavorName, flavorName)
 
 		perAZ := make(map[liquid.AvailabilityZone]*liquid.AZResourceCapacityReport)
+		for _, az := range req.AllAZs {
+			perAZ[az] = &liquid.AZResourceCapacityReport{Capacity: 0}
+		}
 		for _, node := range matchingNodes {
 			logg.Debug("Ironic node %q (%s) matches flavor %s", node.Name, node.UUID, flavorName)
 
@@ -135,9 +138,9 @@ func (l *Logic) ScanCapacity(ctx context.Context, req liquid.ServiceCapacityRequ
 			az := azForResourceProviderUUID[node.UUID]
 			if !slices.Contains(req.AllAZs, az) {
 				az = liquid.AvailabilityZoneUnknown
-			}
-			if perAZ[az] == nil {
-				perAZ[az] = &liquid.AZResourceCapacityReport{Capacity: 0}
+				if perAZ[az] == nil {
+					perAZ[az] = &liquid.AZResourceCapacityReport{Capacity: 0}
+				}
 			}
 			perAZ[az].Capacity++