From 5b67d58f7d59eaf81f15c21eef12a46c9d7e7688 Mon Sep 17 00:00:00 2001 From: Yun Huang Date: Thu, 24 May 2018 13:11:27 +0800 Subject: Fix non-administator check capacity exception Change-Id: I6c27713a1c36abeacb37ab6012ec23587a262e5d Issue-ID: MULTICLOUD-168 Signed-off-by: Yun Huang --- .../titanium_cloud/resource/views/capacity.py | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'windriver') diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py index 11c831fd..0dde5994 100644 --- a/windriver/titanium_cloud/resource/views/capacity.py +++ b/windriver/titanium_cloud/resource/views/capacity.py @@ -66,13 +66,26 @@ class CapacityCheck(APIView): self._logger.debug("check limits> resp data:%s" % content) #get total resource of this cloud region - 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) + 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']) + 2 + conFreeRamMB = int(resource_demand['Memory']) + 2 + conFreeDiskGB = int(resource_demand['Storage']) + 2 + 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' -- cgit 1.2.3-korg