Code Review
/
multicloud
/
framework.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update license
[multicloud/framework.git]
/
multivimbroker
/
multivimbroker
/
pub
/
utils
/
restcall.py
diff --git
a/multivimbroker/multivimbroker/pub/utils/restcall.py
b/multivimbroker/multivimbroker/pub/utils/restcall.py
index
ccdbada
..
23cb963
100644
(file)
--- a/
multivimbroker/multivimbroker/pub/utils/restcall.py
+++ b/
multivimbroker/multivimbroker/pub/utils/restcall.py
@@
-1,4
+1,5
@@
# Copyright (c) 2017 Wind River Systems, Inc.
# Copyright (c) 2017 Wind River Systems, 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.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-81,7
+82,7
@@
def call_req(base_url, user, passwd, auth_type, resource, method,
raise ex
except urllib2.URLError as err:
ret = [2, str(err), resp_status, resp]
raise ex
except urllib2.URLError as err:
ret = [2, str(err), resp_status, resp]
- except Exception
as ex
:
+ except Exception:
logger.error(traceback.format_exc())
logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
res_info = str(sys.exc_info())
logger.error(traceback.format_exc())
logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
res_info = str(sys.exc_info())
@@
-89,9
+90,6
@@
def call_req(base_url, user, passwd, auth_type, resource, method,
res_info = "The URL[%s] request \
failed or is not responding." % full_url
ret = [3, res_info, resp_status, resp]
res_info = "The URL[%s] request \
failed or is not responding." % full_url
ret = [3, res_info, resp_status, resp]
- except:
- logger.error(traceback.format_exc())
- ret = [4, str(sys.exc_info()), resp_status, resp]
# logger.debug("[%s]ret=%s" % (callid, str(ret)))
return ret
# logger.debug("[%s]ret=%s" % (callid, str(ret)))
return ret