X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fforwarder%2Fbase.py;h=534ac7a65dba9de0975cd50458f1fb96b9d7e769;hb=refs%2Fchanges%2F31%2F28131%2F1;hp=8f70c8baac54284e02aa7a72343f24d4b7b5e22f;hpb=300a7e4839621acfb006cd8baadee0c4ed2c8bba;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/forwarder/base.py b/multivimbroker/multivimbroker/forwarder/base.py index 8f70c8b..534ac7a 100644 --- a/multivimbroker/multivimbroker/forwarder/base.py +++ b/multivimbroker/multivimbroker/forwarder/base.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 VMware, Inc. +# Copyright (c) 2017-2018 VMware, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,9 +23,10 @@ from multivimbroker.pub.utils.restcall import req_by_msb logger = logging.getLogger(__name__) + class BaseHandler(object): - def _request(self,route_uri,method,body="",headers=None): + def _request(self, route_uri, method, body="", headers=None): try: retcode, content, status_code, resp = \ @@ -48,18 +49,16 @@ class BaseHandler(object): response[k] = resp[k] return response + def send(self, vimid, full_path, body, method, headers=None): - def send(self,vimid,full_path,body,method,headers=None): - - try: - url = getMultivimDriver(vimid,full_path=full_path) - - except exceptions.VimBrokerException as e: - logging.exception("vimbroker exception: %s"%e) - return HttpResponse(e.content,status=e.status_code) - except Exception as e: - logging.exception("unkown exception: %s" %e) - return HttpResponse(str(e),status=status.HTTP_500_INTERNAL_SERVER_ERROR) - - return self._request(url,method,body=body,headers=headers) + try: + url = getMultivimDriver(vimid, full_path=full_path) + except exceptions.VimBrokerException as e: + logging.exception("vimbroker exception: %s" % e) + return HttpResponse(e.content, status=e.status_code) + except Exception as e: + logging.exception("unkown exception: %s" % e) + return HttpResponse(str(e), + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + return self._request(url, method, body=body, headers=headers)