You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/07/26 13:17:31 UTC

[cloudstack] branch master updated: API: display zone capacity data only to admin

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new dbf11d5  API: display zone capacity data only to admin
dbf11d5 is described below

commit dbf11d5e2d95851d7c581b1a7d3430a344d3d518
Author: Marc-Aurèle Brothier <m...@brothier.org>
AuthorDate: Mon May 8 09:55:03 2017 +0200

    API: display zone capacity data only to admin
---
 server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
index 97a7497..ffc7530 100644
--- a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
@@ -76,10 +76,10 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
             zoneResponse.setInternalDns2(dataCenter.getInternalDns2());
             // FIXME zoneResponse.setVlan(dataCenter.get.getVnet());
             zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
-        }
 
-        if (showCapacities != null && showCapacities) {
-            zoneResponse.setCapacitites(ApiResponseHelper.getDataCenterCapacityResponse(dataCenter.getId()));
+            if (showCapacities != null && showCapacities) {
+                zoneResponse.setCapacitites(ApiResponseHelper.getDataCenterCapacityResponse(dataCenter.getId()));
+            }
         }
 
         // set network domain info

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].