summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newton/newton/resource/views/capacity.py32
-rw-r--r--ocata/ocata/resource/views/capacity.py30
-rw-r--r--windriver/titanium_cloud/resource/views/capacity.py12
3 files changed, 53 insertions, 21 deletions
diff --git a/newton/newton/resource/views/capacity.py b/newton/newton/resource/views/capacity.py
index 8ea37062..973bc980 100644
--- a/newton/newton/resource/views/capacity.py
+++ b/newton/newton/resource/views/capacity.py
@@ -61,12 +61,28 @@ class CapacityCheck(APIView):
resp = sess.get(req_resouce, endpoint_filter=service)
content = resp.json()
compute_limits = content['limits']['absolute']
-
+
#get total resource of this cloud region
- req_resouce = "/os-hypervisors/statistics"
- resp = sess.get(req_resouce, endpoint_filter=service)
- content = resp.json()
- hypervisor_statistics = content['hypervisor_statistics']
+ try:
+ req_resouce = "/os-hypervisors/statistics"
+ self._logger.info("check os-hypervisors statistics> URI:%s" % req_resouce)
+ resp = sess.get(req_resouce, endpoint_filter=service)
+ self._logger.info("check os-hypervisors statistics> status:%s" % resp.status_code)
+ content = resp.json()
+ hypervisor_statistics = content['hypervisor_statistics']
+ self._logger.debug("check os-hypervisors statistics> resp data:%s" % content)
+ except HttpError as e:
+ if e.http_status == status.HTTP_403_FORBIDDEN:
+ # Due to non administrator account cannot get hypervisor data,
+ # so construct enough resource data
+ conVCPUS = int(resource_demand['vCPU'])
+ conFreeRamMB = int(resource_demand['Memory'])
+ conFreeDiskGB = int(resource_demand['Storage'])
+ self._logger.info("Non administator forbidden to access hypervisor statistics data")
+ hypervisor_statistics = {'vcpus_used':0, 'vcpus':conVCPUS, 'free_ram_mb':conFreeRamMB, 'free_disk_gb':conFreeDiskGB}
+ else:
+ # non forbiden exeption will be redirected
+ raise e
#get storage limit for this tenant
service['service_type'] = 'volumev2'
@@ -93,11 +109,11 @@ class CapacityCheck(APIView):
remainStorage = remainHypervisorStorage
# compare resource demanded with available
- if (int(resource_demand['vCPU']) >= remainVCPU):
+ if (int(resource_demand['vCPU']) > remainVCPU):
hasEnoughResource = False
- elif (int(resource_demand['Memory']) >= remainMEM):
+ elif (int(resource_demand['Memory']) > remainMEM):
hasEnoughResource = False
- elif (int(resource_demand['Storage']) >= remainStorage):
+ elif (int(resource_demand['Storage']) > remainStorage):
hasEnoughResource = False
else:
hasEnoughResource = True
diff --git a/ocata/ocata/resource/views/capacity.py b/ocata/ocata/resource/views/capacity.py
index 8ea37062..37c920e4 100644
--- a/ocata/ocata/resource/views/capacity.py
+++ b/ocata/ocata/resource/views/capacity.py
@@ -63,10 +63,26 @@ class CapacityCheck(APIView):
compute_limits = content['limits']['absolute']
#get total resource of this cloud region
- req_resouce = "/os-hypervisors/statistics"
- resp = sess.get(req_resouce, endpoint_filter=service)
- content = resp.json()
- hypervisor_statistics = content['hypervisor_statistics']
+ try:
+ req_resouce = "/os-hypervisors/statistics"
+ self._logger.info("check os-hypervisors statistics> URI:%s" % req_resouce)
+ resp = sess.get(req_resouce, endpoint_filter=service)
+ self._logger.info("check os-hypervisors statistics> status:%s" % resp.status_code)
+ content = resp.json()
+ hypervisor_statistics = content['hypervisor_statistics']
+ self._logger.debug("check os-hypervisors statistics> resp data:%s" % content)
+ except HttpError as e:
+ if e.http_status == status.HTTP_403_FORBIDDEN:
+ # Due to non administrator account cannot get hypervisor data,
+ # so construct enough resource data
+ conVCPUS = int(resource_demand['vCPU'])
+ conFreeRamMB = int(resource_demand['Memory'])
+ conFreeDiskGB = int(resource_demand['Storage'])
+ self._logger.info("Non administator forbidden to access hypervisor statistics data")
+ hypervisor_statistics = {'vcpus_used':0, 'vcpus':conVCPUS, 'free_ram_mb':conFreeRamMB, 'free_disk_gb':conFreeDiskGB}
+ else:
+ # non forbiden exeption will be redirected
+ raise e
#get storage limit for this tenant
service['service_type'] = 'volumev2'
@@ -93,11 +109,11 @@ class CapacityCheck(APIView):
remainStorage = remainHypervisorStorage
# compare resource demanded with available
- if (int(resource_demand['vCPU']) >= remainVCPU):
+ if (int(resource_demand['vCPU']) > remainVCPU):
hasEnoughResource = False
- elif (int(resource_demand['Memory']) >= remainMEM):
+ elif (int(resource_demand['Memory']) > remainMEM):
hasEnoughResource = False
- elif (int(resource_demand['Storage']) >= remainStorage):
+ elif (int(resource_demand['Storage']) > remainStorage):
hasEnoughResource = False
else:
hasEnoughResource = True
diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py
index 0dde5994..6adb8785 100644
--- a/windriver/titanium_cloud/resource/views/capacity.py
+++ b/windriver/titanium_cloud/resource/views/capacity.py
@@ -78,9 +78,9 @@ class CapacityCheck(APIView):
if e.http_status == status.HTTP_403_FORBIDDEN:
# Due to non administrator account cannot get hypervisor data,
# so construct enough resource data
- conVCPUS = int(resource_demand['vCPU']) + 2
- conFreeRamMB = int(resource_demand['Memory']) + 2
- conFreeDiskGB = int(resource_demand['Storage']) + 2
+ conVCPUS = int(resource_demand['vCPU'])
+ conFreeRamMB = int(resource_demand['Memory'])
+ conFreeDiskGB = int(resource_demand['Storage'])
self._logger.info("Non administator forbidden to access hypervisor statistics data")
hypervisor_statistics = {'vcpus_used':0, 'vcpus':conVCPUS, 'free_ram_mb':conFreeRamMB, 'free_disk_gb':conFreeDiskGB}
else:
@@ -115,11 +115,11 @@ class CapacityCheck(APIView):
remainStorage = remainHypervisorStorage
# compare resource demanded with available
- if (int(resource_demand['vCPU']) >= remainVCPU):
+ if (int(resource_demand['vCPU']) > remainVCPU):
hasEnoughResource = False
- elif (int(resource_demand['Memory']) >= remainMEM):
+ elif (int(resource_demand['Memory']) > remainMEM):
hasEnoughResource = False
- elif (int(resource_demand['Storage']) >= remainStorage):
+ elif (int(resource_demand['Storage']) > remainStorage):
hasEnoughResource = False
else:
hasEnoughResource = True