From 3a19740ffb8cba8aec120103cdf42b8b09751da1 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Mon, 28 Jan 2019 03:58:54 +0000 Subject: Remove the heatbridge call The heatbridge call results in API timeout due to AAI performance constraints Change-Id: I5393a0da004aca6a02c233898e70c77c4e09ad10 Issue-ID: MULTICLOUD-456 Signed-off-by: Bin Yang --- ocata/ocata/resource/views/infra_workload.py | 12 ++++++------ pike/pike/resource/views/infra_workload.py | 12 ++++++------ windriver/titanium_cloud/resource/views/infra_workload.py | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ocata/ocata/resource/views/infra_workload.py b/ocata/ocata/resource/views/infra_workload.py index b9d754b6..fd5070db 100644 --- a/ocata/ocata/resource/views/infra_workload.py +++ b/ocata/ocata/resource/views/infra_workload.py @@ -150,8 +150,8 @@ class InfraWorkload(APIView): if retcode > 0: resp_template['workload_response'] = content - if ('CREATE_COMPLETE' == stack_status): - self.heatbridge_update(request, vimid, stack_id) + # if ('CREATE_COMPLETE' == stack_status): + # self.heatbridge_update(request, vimid, stack_id) self._logger.info("RESP with data> result:%s" % resp_template) return Response(data=resp_template, status=status.HTTP_200_OK) @@ -343,10 +343,10 @@ class InfraWorkload(APIView): self._logger.info("delete stack, URI:%s" % resource_uri) retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "DELETE") - if retcode == 0: - stack_status = "DELETE_IN_PROCESS" - # and update AAI inventory by heatbridge-delete - self.heatbridge_delete(request, vimid, stack1['id']) + # if retcode == 0: + # stack_status = "DELETE_IN_PROCESS" + # # and update AAI inventory by heatbridge-delete + # self.heatbridge_delete(request, vimid, stack1['id']) resp_template = { "template_type": template_type, diff --git a/pike/pike/resource/views/infra_workload.py b/pike/pike/resource/views/infra_workload.py index 45352bde..c2ecf0b1 100644 --- a/pike/pike/resource/views/infra_workload.py +++ b/pike/pike/resource/views/infra_workload.py @@ -150,8 +150,8 @@ class InfraWorkload(APIView): if retcode > 0: resp_template['workload_response'] = content - if ('CREATE_COMPLETE' == stack_status): - self.heatbridge_update(request, vimid, stack_id) + # if ('CREATE_COMPLETE' == stack_status): + # self.heatbridge_update(request, vimid, stack_id) self._logger.info("RESP with data> result:%s" % resp_template) return Response(data=resp_template, status=status.HTTP_200_OK) @@ -343,10 +343,10 @@ class InfraWorkload(APIView): self._logger.info("delete stack, URI:%s" % resource_uri) retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "DELETE") - if retcode == 0: - stack_status = "DELETE_IN_PROCESS" - # and update AAI inventory by heatbridge-delete - self.heatbridge_delete(request, vimid, stack1['id']) + # if retcode == 0: + # stack_status = "DELETE_IN_PROCESS" + # # and update AAI inventory by heatbridge-delete + # self.heatbridge_delete(request, vimid, stack1['id']) resp_template = { "template_type": template_type, diff --git a/windriver/titanium_cloud/resource/views/infra_workload.py b/windriver/titanium_cloud/resource/views/infra_workload.py index e4b4b0b5..dcc5615c 100644 --- a/windriver/titanium_cloud/resource/views/infra_workload.py +++ b/windriver/titanium_cloud/resource/views/infra_workload.py @@ -155,8 +155,8 @@ class InfraWorkload(APIView): # return error messsages resp_template['workload_response'] = content - if ('CREATE_COMPLETE' == stack_status): - self.heatbridge_update(request, vimid, stack_id) + # if ('CREATE_COMPLETE' == stack_status): + # self.heatbridge_update(request, vimid, stack_id) self._logger.info("RESP with data> result:%s" % resp_template) return Response(data=resp_template, status=os_status) @@ -213,10 +213,10 @@ class InfraWorkload(APIView): self._logger.info("delete stack, URI:%s" % resource_uri) retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "DELETE") - if retcode == 0: - stack_status = "DELETE_IN_PROCESS" - # and update AAI inventory by heatbridge-delete - self.heatbridge_delete(request, vimid, stack1['id']) + # if retcode == 0: + # stack_status = "DELETE_IN_PROCESS" + # # and update AAI inventory by heatbridge-delete + # self.heatbridge_delete(request, vimid, stack1['id']) # stub response resp_template = { -- cgit 1.2.3-korg