apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.19' into 4.20

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-07-30 18:14:58 +05:30
commit 7e0414354a
No known key found for this signature in database
GPG Key ID: D7CEAE3A9E71D0AA
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
View File

@ -132,14 +132,16 @@ public class ListCapacityCmd extends BaseListCmd {
Collections.sort(capacityResponses, new Comparator<CapacityResponse>() { Collections.sort(capacityResponses, new Comparator<CapacityResponse>() {
public int compare(CapacityResponse resp1, CapacityResponse resp2) { public int compare(CapacityResponse resp1, CapacityResponse resp2) {
int res = resp1.getZoneName().compareTo(resp2.getZoneName()); int res = resp1.getZoneName().compareTo(resp2.getZoneName());
// Group by zone
if (res != 0) { if (res != 0) {
return res; 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.setResponses(capacityResponses);
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());
this.setResponseObject(response); this.setResponseObject(response);