diff options
author | fujinhua <fu.jinhua@zte.com.cn> | 2019-07-03 16:16:15 +0800 |
---|---|---|
committer | fujinhua <fu.jinhua@zte.com.cn> | 2019-07-03 16:16:15 +0800 |
commit | d19480a60b4337698df55f4d9c0fadbd38737811 (patch) | |
tree | ce1f9f24f02255a6a714a9dd24fa8bf00e546e0e /zte/vmanager/driver | |
parent | 98315d35b20a4b035570ce86be9342526b6f3866 (diff) |
Update python2 to python3
Change-Id: I1dfd73fe4a934ed1f46d016bdb29df17dfda2a75
Issue-ID: VFC-1429
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'zte/vmanager/driver')
-rw-r--r-- | zte/vmanager/driver/interfaces/views.py | 16 | ||||
-rw-r--r-- | zte/vmanager/driver/pub/utils/restcall.py | 4 | ||||
-rw-r--r-- | zte/vmanager/driver/swagger/management/commands/export_swagger.py | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/zte/vmanager/driver/interfaces/views.py b/zte/vmanager/driver/interfaces/views.py index 93d65100..811a189f 100644 --- a/zte/vmanager/driver/interfaces/views.py +++ b/zte/vmanager/driver/interfaces/views.py @@ -139,7 +139,7 @@ class InstantiateVnf(APIView): return Response(data=resp_data, status=status.HTTP_200_OK) except Exception as e: - logger.error("Error occurred when instantiating VNF,error:%s", e.message) + logger.error("Error occurred when instantiating VNF,error:%s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -188,7 +188,7 @@ class TerminateVnf(APIView): logger.debug("[%s]resp_data=%s", funname, resp_data) return Response(data=resp_data, status=status.HTTP_200_OK) except Exception as e: - logger.error("Error occurred when terminating VNF,error: %s", e.message) + logger.error("Error occurred when terminating VNF,error: %s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -236,7 +236,7 @@ class QueryVnf(APIView): logger.debug("[%s]resp_data=%s", funname, resp_data) return Response(data=resp_data, status=status.HTTP_200_OK) except Exception as e: - logger.error("Error occurred when querying VNF information,error:%s", e.message) + logger.error("Error occurred when querying VNF information,error:%s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -295,7 +295,7 @@ class JobView(APIView): return Response(data=resp_data, status=status.HTTP_200_OK) except Exception as e: - logger.error("Error occurred when getting operation status information,error:%s", e.message) + logger.error("Error occurred when getting operation status information,error:%s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -365,7 +365,7 @@ class GrantVnf(APIView): return Response(data=resp_data, status=status.HTTP_201_CREATED) except Exception as e: - logger.error("Error occurred in Grant VNF, error: %s", e.message) + logger.error("Error occurred in Grant VNF, error: %s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -455,7 +455,7 @@ class Notify(APIView): return Response(data=None, status=status.HTTP_200_OK) except Exception as e: - logger.error("Error occurred in LCM notification,error: %s", e.message) + logger.error("Error occurred in LCM notification,error: %s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -515,7 +515,7 @@ class Scale(APIView): return Response(data=resp_data, status=status.HTTP_202_ACCEPTED) except Exception as e: - logger.error("Error occurred when scaling VNF,error:%s", e.message) + logger.error("Error occurred when scaling VNF,error:%s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ @@ -576,7 +576,7 @@ class Heal(APIView): return Response(data=resp_data, status=status.HTTP_202_ACCEPTED) except Exception as e: - logger.error("Error occurred when healing VNF,error:%s", e.message) + logger.error("Error occurred when healing VNF,error:%s", e.args[0]) logger.error(traceback.format_exc()) return Response( data={ diff --git a/zte/vmanager/driver/pub/utils/restcall.py b/zte/vmanager/driver/pub/utils/restcall.py index fd0b3ddd..6b2c4b05 100644 --- a/zte/vmanager/driver/pub/utils/restcall.py +++ b/zte/vmanager/driver/pub/utils/restcall.py @@ -15,7 +15,7 @@ import logging import sys import traceback -import urllib2 +import urllib.error import uuid import httplib2 @@ -61,7 +61,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content=''): ret = [1, "Unable to connect to %s" % full_url, resp_status] continue raise ex - except urllib2.URLError as err: + except urllib.error.URLError as err: ret = [2, str(err), resp_status] except Exception as ex: logger.error(traceback.format_exc()) diff --git a/zte/vmanager/driver/swagger/management/commands/export_swagger.py b/zte/vmanager/driver/swagger/management/commands/export_swagger.py index 4971022f..31f4e190 100644 --- a/zte/vmanager/driver/swagger/management/commands/export_swagger.py +++ b/zte/vmanager/driver/swagger/management/commands/export_swagger.py @@ -33,4 +33,4 @@ class Command(BaseCommand): response = self.client.get("/api/ztevnfmdriver/v1/swagger.json") with open(options['name'], 'w') as swagger_file: swagger_file.write(json.dumps(response.data)) - print "swagger api is written to %s" % options['name'] + print("swagger api is written to %s" % options['name']) |