cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/4.2 to f91b649
Date Wed, 16 Oct 2013 22:01:58 GMT
Updated Branches:
  refs/heads/4.2 0032ff23f -> f91b649b3


CLOUDSTACK-4882:
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>


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

Branch: refs/heads/4.2
Commit: f91b649b3b56099528fd8e6958a3bd45b7a353f8
Parents: 0032ff2
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Wed Oct 16 15:01:33 2013 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Wed Oct 16 15:01:33 2013 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java | 7 ++++++-
 server/src/com/cloud/api/ApiResponseHelper.java               | 6 +++---
 server/src/com/cloud/server/ManagementServerImpl.java         | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f91b649b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index 88a2b2b..bd1e6f0 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -360,7 +360,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
                 if(level == 3 && rs.getLong(7) != 0)
                     capacityClusterId = rs.getLong(7);                   
 
-                SummedCapacity summedCapacity = new SummedCapacity( rs.getLong(1), rs.getLong(3),
rs.getFloat(4),
+                SummedCapacity summedCapacity = new SummedCapacity( rs.getLong(1), rs.getLong(2),
rs.getLong(3), rs.getFloat(4),
                         (short)rs.getLong(5), rs.getLong(6),
                         capacityPodId, capacityClusterId);
 
@@ -565,6 +565,11 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long>
implements
             this.dcId = zoneId;
         }
 
+        public SummedCapacity(long sumUsed, long sumReserved, long sumTotal, float percentUsed,
short capacityType, Long zoneId, Long podId, Long clusterId) {
+            this(sumUsed, sumTotal, percentUsed, capacityType, zoneId, podId, clusterId);
+            this.sumReserved = sumReserved;
+        }
+
         public Short getCapacityType() {				
             return capacityType;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f91b649b/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 18e0ce3..b5d2de6 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -795,7 +795,7 @@ public class ApiResponseHelper implements ResponseGenerator {
             for (SummedCapacity capacity : capacities) {
                 CapacityResponse capacityResponse = new CapacityResponse();
                 capacityResponse.setCapacityType(capacity.getCapacityType());
-                capacityResponse.setCapacityUsed(capacity.getUsedCapacity());
+                capacityResponse.setCapacityUsed(capacity.getUsedCapacity() + capacity.getReservedCapacity());
                 if (capacity.getCapacityType() == Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED)
{
                     List<SummedCapacity> c = ApiDBUtils.findNonSharedStorageForClusterPodZone(null,
pod.getId(), null);
                     capacityResponse.setCapacityTotal(capacity.getTotalCapacity() - c.get(0).getTotalCapacity());
@@ -833,7 +833,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         for (SummedCapacity capacity : capacities) {
             CapacityResponse capacityResponse = new CapacityResponse();
             capacityResponse.setCapacityType(capacity.getCapacityType());
-            capacityResponse.setCapacityUsed(capacity.getUsedCapacity());
+            capacityResponse.setCapacityUsed(capacity.getUsedCapacity() + capacity.getReservedCapacity());
             if (capacity.getCapacityType() == Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED) {
                 List<SummedCapacity> c = ApiDBUtils.findNonSharedStorageForClusterPodZone(zoneId,
null, null);
                 capacityResponse.setCapacityTotal(capacity.getTotalCapacity() - c.get(0).getTotalCapacity());
@@ -954,7 +954,7 @@ public class ApiResponseHelper implements ResponseGenerator {
             for (SummedCapacity capacity : capacities) {
                 CapacityResponse capacityResponse = new CapacityResponse();
                 capacityResponse.setCapacityType(capacity.getCapacityType());
-                capacityResponse.setCapacityUsed(capacity.getUsedCapacity());
+                capacityResponse.setCapacityUsed(capacity.getUsedCapacity() + capacity.getReservedCapacity());
 
                 if (capacity.getCapacityType() == Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED)
{
                     List<SummedCapacity> c = ApiDBUtils.findNonSharedStorageForClusterPodZone(null,
null, cluster.getId());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f91b649b/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 8437c99..00c534b 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -2406,7 +2406,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
         for (SummedCapacity summedCapacity : summedCapacities) {
             CapacityVO capacity = new CapacityVO(summedCapacity.getDataCenterId(), summedCapacity.getPodId(),
summedCapacity.getClusterId(),
                     summedCapacity.getCapacityType(), summedCapacity.getPercentUsed());
-            capacity.setUsedCapacity(summedCapacity.getUsedCapacity());
+            capacity.setUsedCapacity(summedCapacity.getUsedCapacity() + summedCapacity.getReservedCapacity());
             capacity.setTotalCapacity(summedCapacity.getTotalCapacity());
             capacities.add(capacity);
         }


Mime
View raw message