From 78ead3c00e16cf9e4fd24535a925d3766c6f6aa8 Mon Sep 17 00:00:00 2001 From: Xiaohua Zhang Date: Tue, 27 Nov 2018 10:30:56 +0000 Subject: Fix pep8 errors in windriver plugin Fix errors in resource module Change-Id: I59d43b3c62928bdacffc7fcd6f4c1c8055412e59 Issue-ID: MULTICLOUD-420 Signed-off-by: Xiaohua Zhang --- .../resource/views/infra_workload.py | 274 +++++++++++++-------- 1 file changed, 173 insertions(+), 101 deletions(-) (limited to 'windriver/titanium_cloud/resource/views/infra_workload.py') diff --git a/windriver/titanium_cloud/resource/views/infra_workload.py b/windriver/titanium_cloud/resource/views/infra_workload.py index ec1e5744..681a7f91 100644 --- a/windriver/titanium_cloud/resource/views/infra_workload.py +++ b/windriver/titanium_cloud/resource/views/infra_workload.py @@ -16,11 +16,9 @@ import logging import json import traceback -from rest_framework import status - from django.conf import settings from common.exceptions import VimDriverNewtonException -from newton_base.util import VimDriverUtils +# from newton_base.util import VimDriverUtils from keystoneauth1.exceptions import HttpError from rest_framework import status @@ -35,7 +33,6 @@ logger = logging.getLogger(__name__) class InfraWorkload(APIView): - def __init__(self): self._logger = logger @@ -44,7 +41,7 @@ class InfraWorkload(APIView): self._logger.info("data: %s" % (request.data)) self._logger.debug("META: %s" % request.META) - try : + try: data = request.data oof_directive = data.get("oof_directives", {}) @@ -55,41 +52,54 @@ class InfraWorkload(APIView): # update heat parameters from oof_directive parameters = template_data.get("parameters", {}) - for directive in oof_directive.get("directives",[]): + for directive in oof_directive.get("directives", []): if directive["type"] == "vnfc": - for directive2 in directive.get("directives",[]): - if directive2["type"] in ["flavor_directives", "sriovNICNetwork_directives"]: - for attr in directive2.get("attributes",[]): + for directive2 in directive.get("directives", []): + if directive2["type"] in ["flavor_directives", + "sriovNICNetwork_directives"]: + for attr in directive2.get("attributes", []): flavor_label = attr.get("attribute_name", None) flavor_value = attr.get("attribute_value", None) - if parameters.has_key(flavor_label): + if flavor_label in parameters: parameters[flavor_label] = flavor_value else: - self._logger.warn("There is no parameter exist: %s" % - flavor_label) + self._logger.warn( + "There is no parameter exist: %s" % + flavor_label) # update parameters - template_data["parameters"]=parameters + template_data["parameters"] = parameters # reset to make sure "files" are empty template_data["files"] = {} # authenticate cloud_owner, regionid = extsys.decode_vim_id(vimid) - # should go via multicloud proxy so that the selflink is updated by multicloud - retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX, - cloud_owner, regionid, "/v2.0/tokens") + # should go via multicloud proxy so that + # the selflink is updated by multicloud + retcode, v2_token_resp_json, os_status = \ + helper.MultiCloudIdentityHelper( + settings.MULTICLOUD_API_V1_PREFIX, + cloud_owner, regionid, "/v2.0/tokens") + if retcode > 0 or not v2_token_resp_json: - logger.error("authenticate fails:%s,%s, %s" % (cloud_owner, regionid, v2_token_resp_json)) + logger.error("authenticate fails:%s,%s, %s" % + (cloud_owner, regionid, v2_token_resp_json)) return # tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"] service_type = "orchestration" resource_uri = "/stacks" self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, template_data, "POST") - stack1 = content.get('stack', None) if retcode == 0 and content else None + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + template_data, "POST") + + stack1 = content.get('stack', None) \ + if retcode == 0 and content else None + resp_template = { "template_type": template_type, "workload_id": stack1["id"] if stack1 else "", @@ -102,35 +112,39 @@ class InfraWorkload(APIView): else: msg = "The template type %s is not supported" % (template_type) self._logger.warn(msg) - return Response(data={"error":msg}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + return Response(data={"error": msg}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) except VimDriverNewtonException as e: self._logger.error("Plugin exception> status:%s,error:%s" - % (e.status_code, e.content)) + % (e.status_code, e.content)) return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: - self._logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json())) + self._logger.error("HttpError: status:%s, response:%s" % + (e.http_status, e.response.json())) return Response(data=e.response.json(), status=e.http_status) except Exception as e: self._logger.error(traceback.format_exc()) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - def get(self, request, vimid="", requri=""): self._logger.info("vimid,requri: %s, %s" % (vimid, requri)) self._logger.debug("META: %s" % request.META) - try : + try: # assume the workload_type is heat stack_id = requri cloud_owner, regionid = extsys.decode_vim_id(vimid) # should go via multicloud proxy so that the selflink is updated by multicloud - retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper( - settings.MULTICLOUD_API_V1_PREFIX, - cloud_owner, regionid, "/v2.0/tokens") - if retcode > 0 or not v2_token_resp_json: - logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json)) + retcode, v2_token_resp_json, os_status = \ + helper.MultiCloudIdentityHelper( + settings.MULTICLOUD_API_V1_PREFIX, + cloud_owner, regionid, "/v2.0/tokens") + + if retcode > 0 or not v2_token_resp_json: + logger.error("authenticate fails:%s, %s, %s" % + (cloud_owner, regionid, v2_token_resp_json)) return # tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"] # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"] @@ -139,8 +153,12 @@ class InfraWorkload(APIView): service_type = "orchestration" resource_uri = "/stacks?id=%s" % stack_id if stack_id else "/stacks" self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + stacks = content.get('stacks', []) if retcode == 0 and content else [] stack_status = stacks[0]["stack_status"] if len(stacks) > 0 else "" @@ -162,10 +180,11 @@ class InfraWorkload(APIView): return Response(data=resp_template, status=os_status) except VimDriverNewtonException as e: self._logger.error("Plugin exception> status:%s,error:%s" - % (e.status_code, e.content)) + % (e.status_code, e.content)) return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: - self._logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json())) + self._logger.error("HttpError: status:%s, response:%s" % + (e.http_status, e.response.json())) return Response(data=e.response.json(), status=e.http_status) except Exception as e: self._logger.error(traceback.format_exc()) @@ -173,19 +192,23 @@ class InfraWorkload(APIView): status=status.HTTP_500_INTERNAL_SERVER_ERROR) def delete(self, request, vimid="", requri=""): - self._logger.info("vimid,requri: %s, %s" % (vimid,requri)) + self._logger.info("vimid,requri: %s, %s" % (vimid, requri)) self._logger.debug("META: %s" % request.META) - try : + try: # assume the workload_type is heat stack_id = requri cloud_owner, regionid = extsys.decode_vim_id(vimid) - # should go via multicloud proxy so that the selflink is updated by multicloud - retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper( - settings.MULTICLOUD_API_V1_PREFIX, - cloud_owner, regionid, "/v2.0/tokens") - if retcode > 0 or not v2_token_resp_json: - logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json)) + # should go via multicloud proxy so that + # the selflink is updated by multicloud + retcode, v2_token_resp_json, os_status = \ + helper.MultiCloudIdentityHelper( + settings.MULTICLOUD_API_V1_PREFIX, + cloud_owner, regionid, "/v2.0/tokens") + + if retcode > 0 or not v2_token_resp_json: + logger.error("authenticate fails:%s, %s, %s" % + (cloud_owner, regionid, v2_token_resp_json)) return # tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"] # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"] @@ -194,19 +217,29 @@ class InfraWorkload(APIView): service_type = "orchestration" resource_uri = "/stacks?id=%s" % stack_id if stack_id else "/stacks" self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") - stacks = content.get('stacks', []) if retcode == 0 and content else [] - # assume there is at most 1 stack returned since it was filtered by id + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + + stacks = content.get('stacks', []) \ + if retcode == 0 and content else [] + # assume there is at most 1 stack returned + # since it was filtered by id stack1 = stacks[0] if stacks else None stack_status = "" if stack1 and 'CREATE_COMPLETE' == stack1['stack_status']: # delete the stack - resource_uri = "/stacks/%s/%s" % (stack1['stack_name'], stack1['id']) + resource_uri = "/stacks/%s/%s" % \ + (stack1['stack_name'], stack1['id']) 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") + 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 @@ -226,10 +259,11 @@ class InfraWorkload(APIView): return Response(status=os_status) except VimDriverNewtonException as e: self._logger.error("Plugin exception> status:%s,error:%s" - % (e.status_code, e.content)) + % (e.status_code, e.content)) return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: - self._logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json())) + self._logger.error("HttpError: status:%s, response:%s" % + (e.http_status, e.response.json())) return Response(data=e.response.json(), status=e.http_status) except Exception as e: self._logger.error(traceback.format_exc()) @@ -248,27 +282,35 @@ class InfraWorkload(APIView): cloud_owner, regionid = extsys.decode_vim_id(vimid) # should go via multicloud proxy so that the selflink is updated by multicloud - retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX, - cloud_owner, regionid, "/v2.0/tokens") + retcode, v2_token_resp_json, os_status = \ + helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX, + cloud_owner, regionid, "/v2.0/tokens") if retcode > 0: - logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json)) + logger.error("authenticate fails:%s, %s, %s" % + (cloud_owner, regionid, v2_token_resp_json)) + return None tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"] # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"] # common prefix - aai_cloud_region = "/cloud-infrastructure/cloud-regions/cloud-region/%s/%s/tenants/tenant/%s" \ - % (cloud_owner, regionid, tenant_id) + aai_cloud_region = \ + "/cloud-infrastructure/cloud-regions/cloud-region/%s/%s/tenants/tenant/%s" \ + % (cloud_owner, regionid, tenant_id) # get stack resource service_type = "orchestration" - resource_uri = "/stacks/%s/resources"%(stack_id) + resource_uri = "/stacks/%s/resources" % (stack_id) self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + resources = content.get('resources', []) if retcode == 0 and content else [] - #find and update resources + # find and update resources transactions = [] for resource in resources: if resource.get('resource_status', None) != "CREATE_COMPLETE": @@ -278,8 +320,12 @@ class InfraWorkload(APIView): service_type = "compute" resource_uri = "/servers/%s" % (resource['physical_resource_id']) self._logger.info("retrieve vserver detail, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + self._logger.debug(" resp data:%s" % content) vserver_detail = content.get('server', None) if retcode == 0 and content else None if vserver_detail: @@ -302,24 +348,26 @@ class InfraWorkload(APIView): "vserver-selflink": vserver_link, "prov-status": vserver_detail['status'] }, - "uri": aai_cloud_region + "/vservers/vserver/%s"\ - % ( vserver_detail['id'])} + "uri": aai_cloud_region + "/vservers/vserver/%s" % (vserver_detail['id']) + } try: # then update the resource retcode, content, status_code = \ - restcall.req_to_aai(aai_resource['uri'], "PUT", content=aai_resource['body']) + restcall.req_to_aai(aai_resource['uri'], + "PUT", content=aai_resource['body']) if retcode == 0 and content: content = json.JSONDecoder().decode(content) - self._logger.debug("AAI update %s response: %s" % (aai_resource['uri'], content)) - except Exception as e: + self._logger.debug("AAI update %s response: %s" % + (aai_resource['uri'], content)) + except Exception: self._logger.error(traceback.format_exc()) pass aai_resource_transactions = {"put": [aai_resource]} transactions.append(aai_resource_transactions) - #self._logger.debug("aai_resource :%s" % aai_resource_transactions) + # self._logger.debug("aai_resource :%s" % aai_resource_transactions) pass for resource in resources: @@ -330,33 +378,42 @@ class InfraWorkload(APIView): service_type = "network" resource_uri = "/v2.0/ports/%s" % (resource['physical_resource_id']) self._logger.info("retrieve vport detail, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + self._logger.debug(" resp data:%s" % content) vport_detail = content.get('port', None) if retcode == 0 and content else None if vport_detail: # compose inventory entry for vport - # note: l3-interface-ipv4-address-list, l3-interface-ipv6-address-list are not updated yet - # note: network-name is not update yet since the detail coming with network-id + # note: l3-interface-ipv4-address-list, + # l3-interface-ipv6-address-list are not updated yet + # note: network-name is not update yet since the detail + # coming with network-id aai_resource = { "body": { "interface-name": vport_detail['name'], "interface-id": vport_detail['id'], "macaddr": vport_detail['mac_address'] }, - 'uri': aai_cloud_region + "/vservers/vserver/%s/l-interfaces/l-interface/%s" \ - % (vport_detail['device_id'], vport_detail['name']) + 'uri': + aai_cloud_region + "/vservers/vserver/%s/l-interfaces/l-interface/%s" + % (vport_detail['device_id'], vport_detail['name']) } try: # then update the resource retcode, content, status_code = \ - restcall.req_to_aai(aai_resource['uri'], "PUT", content=aai_resource['body']) + restcall.req_to_aai(aai_resource['uri'], "PUT", + content=aai_resource['body']) if retcode == 0 and content: content = json.JSONDecoder().decode(content) - self._logger.debug("AAI update %s response: %s" % (aai_resource['uri'], content)) - except Exception as e: + self._logger.debug("AAI update %s response: %s" % + (aai_resource['uri'], content)) + except Exception: self._logger.error(traceback.format_exc()) pass @@ -369,7 +426,7 @@ class InfraWorkload(APIView): aai_transactions = {"transactions": transactions} self._logger.debug("aai_transactions :%s" % aai_transactions) - return aai_transactions + return aai_transactions def heatbridge_delete(self, request, vimid, stack_id): ''' @@ -385,26 +442,33 @@ class InfraWorkload(APIView): # enumerate the resources cloud_owner, regionid = extsys.decode_vim_id(vimid) # should go via multicloud proxy so that the selflink is updated by multicloud - retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX, - cloud_owner, regionid, "/v2.0/tokens") + retcode, v2_token_resp_json, os_status = \ + helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX, + cloud_owner, regionid, "/v2.0/tokens") if retcode > 0: - logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json)) + logger.error("authenticate fails:%s, %s, %s" % + (cloud_owner, regionid, v2_token_resp_json)) return None tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"] # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"] # common prefix - aai_cloud_region = "/cloud-infrastructure/cloud-regions/cloud-region/%s/%s/tenants/tenant/%s" \ - % (cloud_owner, regionid, tenant_id) + aai_cloud_region = \ + "/cloud-infrastructure/cloud-regions/cloud-region/%s/%s/tenants/tenant/%s" \ + % (cloud_owner, regionid, tenant_id) # get stack resource service_type = "orchestration" - resource_uri = "/stacks/%s/resources"%(stack_id) + resource_uri = "/stacks/%s/resources" % (stack_id) self._logger.info("retrieve stack resources, URI:%s" % resource_uri) - retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, - service_type, resource_uri, None, "GET") - resources = content.get('resources', []) if retcode == 0 and content else [] + retcode, content, os_status = \ + helper.MultiCloudServiceHelper(cloud_owner, regionid, + v2_token_resp_json, + service_type, resource_uri, + None, "GET") + resources = content.get('resources', []) \ + if retcode == 0 and content else [] vserver_list = [resource['physical_resource_id'] for resource in resources if resource.get('resource_type', None) == 'OS::Nova::Server'] @@ -427,19 +491,25 @@ class InfraWorkload(APIView): # iterate vport, except will be raised if no l-interface exist for vport in vserver['l-interfaces']['l-interface']: # delete vport - vport_delete_url = aai_cloud_region + "/vservers/vserver/%s/l-interfaces/l-interface/%s?resource-version=%s" \ - % (vserver['vserver-id'], vport['interface-name'], - vport['resource-version']) + vport_delete_url = \ + aai_cloud_region + \ + "/vservers/vserver/%s/l-interfaces/l-interface/%s?resource-version=%s" \ + % (vserver['vserver-id'], vport['interface-name'], + vport['resource-version']) + restcall.req_to_aai(vport_delete_url, "DELETE") - except Exception as e: + except Exception: pass try: # delete vserver - vserver_delete_url = aai_cloud_region + "/vservers/vserver/%s?resource-version=%s" \ - % (vserver['vserver-id'], vserver['resource-version']) + vserver_delete_url = \ + aai_cloud_region + \ + "/vservers/vserver/%s?resource-version=%s" \ + % (vserver['vserver-id'], vserver['resource-version']) + restcall.req_to_aai(vserver_delete_url, "DELETE") - except Exception as e: + except Exception: continue except Exception: @@ -449,28 +519,30 @@ class InfraWorkload(APIView): class APIv1InfraWorkload(InfraWorkload): - def __init__(self): super(APIv1InfraWorkload, self).__init__() # self._logger = logger def post(self, request, cloud_owner="", cloud_region_id=""): - #self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data)) - #self._logger.debug("META: %s" % request.META) + # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % + # (cloud_owner, cloud_region_id, request.data)) + # self._logger.debug("META: %s" % request.META) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1InfraWorkload, self).post(request, vimid) def get(self, request, cloud_owner="", cloud_region_id="", requri=""): - #self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data)) - #self._logger.debug("META: %s" % request.META) + # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % + # (cloud_owner, cloud_region_id, request.data)) + # self._logger.debug("META: %s" % request.META) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1InfraWorkload, self).get(request, vimid, requri) def delete(self, request, cloud_owner="", cloud_region_id="", requri=""): - #self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data)) - #self._logger.debug("META: %s" % request.META) + # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % + # (cloud_owner, cloud_region_id, request.data)) + # self._logger.debug("META: %s" % request.META) vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) return super(APIv1InfraWorkload, self).delete(request, vimid, requri) -- cgit 1.2.3-korg