From a6b6fa65facf83444262eb37ca65371a16900a04 Mon Sep 17 00:00:00 2001 From: ynojima Date: Tue, 22 Oct 2013 21:09:27 -0600 Subject: [PATCH] CLOUDSTACK-4932: bugfix : listNetworks API doesn't return VLAN ID (VNI) Signed-off-by: ynojima Signed-off-by: Toshiaki Hatano --- server/src/com/cloud/api/ApiResponseHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 155a563fb5b..de4cc66c365 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -2198,8 +2198,11 @@ public class ApiResponseHelper implements ResponseGenerator { String broadcastUri = network.getBroadcastUri().toString(); response.setBroadcastUri(broadcastUri); String vlan = "N/A"; - if (BroadcastDomainType.Vlan.scheme().equals(BroadcastDomainType.getSchemeValue(network.getBroadcastUri()))) { - vlan = BroadcastDomainType.getValue(network.getBroadcastUri()); + switch (BroadcastDomainType.getSchemeValue(network.getBroadcastUri())){ + case Vlan: + case Vxlan: + vlan = BroadcastDomainType.getValue(network.getBroadcastUri()); + break; } // return vlan information only to Root admin response.setVlan(vlan);