cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hae...@apache.org
Subject git commit: updated refs/heads/master to a6b6fa6
Date Wed, 30 Oct 2013 15:38:07 GMT
Updated Branches:
  refs/heads/master 089026f6a -> a6b6fa65f


CLOUDSTACK-4932: bugfix : listNetworks API doesn't return VLAN ID (VNI)

Signed-off-by: ynojima <mail@ynojima.net>
Signed-off-by: Toshiaki Hatano <haeena@haeena.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a6b6fa65
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a6b6fa65
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a6b6fa65

Branch: refs/heads/master
Commit: a6b6fa65facf83444262eb37ca65371a16900a04
Parents: 089026f
Author: ynojima <mail@ynojima.net>
Authored: Tue Oct 22 21:09:27 2013 -0600
Committer: Toshiaki Hatano <haeena@haeena.net>
Committed: Thu Oct 31 00:37:04 2013 +0900

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiResponseHelper.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6b6fa65/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 155a563..de4cc66 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);


Mime
View raw message