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

CS-14270: return VLAN id only if the broadcast URI starts with 'vlan'

This commit is contained in:
Salvatore Orlando 2012-04-24 14:13:04 +01:00
parent 56d496ac60
commit 8779f0ed25
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2762,11 +2762,13 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
}
// FIXME - either set broadcast URI or vlan
if (network.getBroadcastUri() != null) {
String broadcastUri = network.getBroadcastUri().toString();
response.setBroadcastUri(broadcastUri);
String vlan = broadcastUri.substring("vlan://".length(), broadcastUri.length());
String vlan="N/A";
if (broadcastUri.startsWith("vlan")) {
vlan = broadcastUri.substring("vlan://".length(), broadcastUri.length());
}
response.setVlan(vlan);
}