etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order

This commit is contained in:
Saksham Srivastava 2013-06-19 17:02:59 +05:30 committed by Likitha Shetty
parent e4b98b68da
commit fd77b60c5d
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -21,7 +21,10 @@ import static java.util.Collections.singletonList;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
@ -2583,7 +2586,25 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setZoneId(zone.getUuid());
}
response.setNetworkSpeed(result.getSpeed());
response.setVlan(result.getVnetString());
//Create vlan ranges response
String vlanRanges = null;
vlanRanges = result.getVnetString();
if(vlanRanges != null) {
String [] vlan = vlanRanges.split(";");
//Sort the vlan ranges
Arrays.sort(vlan, new Comparator<String>() {
public int compare (String first, String second) {
return Integer.valueOf(first.split("-")[0]).compareTo(Integer.valueOf(second.split("-")[0]));
}
});
List<String> vlanList = new ArrayList<String>();
Collections.addAll(vlanList, vlan);
vlanRanges = StringUtils.join(vlanList,";");
}
//Set the final String response
response.setVlan(vlanRanges);
if (result.getDomainId() != null) {
Domain domain = ApiDBUtils.findDomainById(result.getDomainId());
if (domain != null) {