diff options
| author |   Yun Huang <yun.huang@windriver.com> | 2018-03-28 11:00:39 +0800 |
|---|---|---|
| committer | Yun Huang <yun.huang@windriver.com> | 2018-03-28 11:00:39 +0800 |
| commit | 8c3a4a8fefd38b48829badf91d12f8c8aa80021f (patch) | |
| tree | 973b7066064c7042ac1d241f8293efbb83cd4c28 | |
| parent | 1365689c286369ed403142fe79d80464f0c124a5 (diff) | |
Fix bug of capacity_check for ocata
Change-Id: I945a06451647324edcf7bcb86e664479311e4ed0
Issue-ID: MULTICLOUD-168
Signed-off-by: Yun Huang <yun.huang@windriver.com>
| -rw-r--r-- | ocata/ocata/resource/views/capacity.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ocata/ocata/resource/views/capacity.py b/ocata/ocata/resource/views/capacity.py index d73cc0fb..8ea37062 100644 --- a/ocata/ocata/resource/views/capacity.py +++ b/ocata/ocata/resource/views/capacity.py @@ -77,20 +77,20 @@ class CapacityCheck(APIView): # compute actual available resource for this tenant remainVCPU = compute_limits['maxTotalCores'] - compute_limits['totalCoresUsed'] + remainHypervisorVCPU = hypervisor_statistics['vcpus'] - hypervisor_statistics['vcpus_used'] - if (compute_limits['maxTotalCores'] > hypervisor_statistics['vcpus']): - if hypervisor_statistics['vcpus'] > compute_limits['totalCoresUsed']: - remainVCPU = hypervisor_statistics['vcpus'] - compute_limits['totalCoresUsed'] - else: - remainVCPU = 0 + if (remainVCPU > remainHypervisorVCPU): + remainVCPU = remainHypervisorVCPU remainMEM = compute_limits['maxTotalRAMSize'] - compute_limits['totalRAMUsed'] - if hypervisor_statistics['free_ram_mb'] > remainMEM: - remainMEM = hypervisor_statistics['free_ram_mb'] + remainHypervisorMEM = hypervisor_statistics['free_ram_mb'] + if remainMEM > remainHypervisorMEM: + remainMEM = remainHypervisorMEM remainStorage = storage_limits['maxTotalVolumeGigabytes'] - storage_limits['totalGigabytesUsed'] - if (remainStorage < hypervisor_statistics['free_disk_gb']): - remainStorage = hypervisor_statistics['free_disk_gb'] + remainHypervisorStorage = hypervisor_statistics['free_disk_gb'] + if (remainStorage > remainHypervisorStorage): + remainStorage = remainHypervisorStorage # compare resource demanded with available if (int(resource_demand['vCPU']) >= remainVCPU): |