Skip to content

Fix listCapacity sort by usage #11316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
Jul 30, 2025
Merged

Fix listCapacity sort by usage #11316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d758fc
fix listCapacity sort by usage
abh1sar Jul 29, 2025
21d509a
make the code more readable, add comments
abh1sar Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,16 @@ public void execute() {
Collections.sort(capacityResponses, new Comparator<CapacityResponse>() {
public int compare(CapacityResponse resp1, CapacityResponse resp2) {
int res = resp1.getZoneName().compareTo(resp2.getZoneName());
// Group by zone
if (res != 0) {
return res;
} else {
return resp1.getCapacityType().compareTo(resp2.getCapacityType());
}
// Sort by capacity type only if not already sorted by usage
return (getSortBy() != null) ? 0 : resp1.getCapacityType().compareTo(resp2.getCapacityType());
}
});


response.setResponses(capacityResponses);
response.setResponseName(getCommandName());
this.setResponseObject(response);
Expand Down
Loading