Skip to content

Commit c21f1c6

Browse files
committed
Fix query to candidates with no traits
1 parent fc776c7 commit c21f1c6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

os_capacity/prometheus.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,15 @@ def get_max_per_host(placement_client, resources, required_traits):
5454
# TODO(johngarbut): remove disabled!
5555
forbidden_str = "COMPUTE_STATUS_DISABLED"
5656

57+
params = {"resources": resource_str}
58+
if not resource_str:
59+
raise Exception("we must have some resources here!")
60+
if required_str:
61+
params["required"] = required_str
62+
5763
response = placement_client.get(
5864
"/allocation_candidates",
59-
params={"resources": resource_str, "required": required_str},
65+
params=params,
6066
headers={"OpenStack-API-Version": "placement 1.29"},
6167
)
6268
raw_data = response.json()
@@ -74,9 +80,7 @@ def get_max_per_host(placement_client, resources, required_traits):
7480
if max_counts:
7581
count_per_rp[rp_uuid] = min(max_counts)
7682
if not count_per_rp:
77-
print(
78-
f"# WARNING - no candidates for resources:{resource_str} traits:{required_str}"
79-
)
83+
print(f"# WARNING - no candidates for: {params}")
8084
return count_per_rp
8185

8286

0 commit comments

Comments
 (0)