From 8779f0ed25419bc0f8624d4378effbd916ec493b Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 24 Apr 2012 14:13:04 +0100 Subject: [PATCH] CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' --- server/src/com/cloud/api/ApiResponseHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 0ca7e9deb49..6d6f4e371d3 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -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); }