summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2018-03-28 04:50:45 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-28 04:50:45 +0000
commit88c16f1784844768692856c6a57583e6aa127391 (patch)
treef4dcb2284eeafe8705c2402a8403332c47886601
parentc8d68023ecefb45d9a11dfe0c8de07e702c57504 (diff)
parent1365689c286369ed403142fe79d80464f0c124a5 (diff)
Merge "Fix bug of capacity_check for newton"
-rw-r--r--newton/newton/resource/views/capacity.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/newton/newton/resource/views/capacity.py b/newton/newton/resource/views/capacity.py
index d73cc0fb..8ea37062 100644
--- a/newton/newton/resource/views/capacity.py
+++ b/newton/newton/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):