From d6d07ea345ddf22a1e4936cd83b62b1970d27ce5 Mon Sep 17 00:00:00 2001 From: hongyuzhao Date: Sun, 29 Sep 2019 17:01:23 +0800 Subject: [PATCH] Code optimization4 Change-Id: I0dc7560e68d544e6ee654d12523ebfe2b3265b1c Issue-ID: VFC-1431 Signed-off-by: hongyuzhao --- lcm/ns_vnfs/views/views.py | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/lcm/ns_vnfs/views/views.py b/lcm/ns_vnfs/views/views.py index b2c07ecd..44c5f015 100644 --- a/lcm/ns_vnfs/views/views.py +++ b/lcm/ns_vnfs/views/views.py @@ -49,10 +49,48 @@ from lcm.ns_vnfs.biz.verify_vnfs import VerifyVnfs from lcm.ns_vnfs.serializers.serializers import VimInfoRespSerializer from lcm.ns_vnfs.serializers.serializers import VnfmInfoRespSerializer from lcm.ns_vnfs.biz import create_vnfs +from lcm.pub.exceptions import BadRequestException logger = logging.getLogger(__name__) +def view_safe_call_with_log(logger): + def view_safe_call(func): + def wrapper(*args, **kwargs): + try: + return func(*args, **kwargs) + except BadRequestException as e: + logger.error(e.args[0]) + return make_error_resp( + detail=e.args[0], + status=status.HTTP_400_BAD_REQUEST + ) + except NSLCMException as e: + logger.error(e.args[0]) + return make_error_resp( + detail=e.args[0], + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + except Exception as e: + logger.error(e.args[0]) + logger.error(traceback.format_exc()) + return make_error_resp( + detail='Unexpected exception', + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + return wrapper + return view_safe_call + + +def make_error_resp(status, detail): + return Response( + data={ + 'error': detail + }, + status=status + ) + + class NfView(APIView): @swagger_auto_schema( request_body=InstVnfReqSerializer(), @@ -241,12 +279,13 @@ class NfScaleView(APIView): status.HTTP_409_CONFLICT: "Inner error" } ) + @view_safe_call_with_log(logger) def post(self, request, vnfinstid): logger.debug("NfScaleView--post::> %s" % request.data) try: req_serializer = ScaleVnfReqSerializer(data=request.data) if not req_serializer.is_valid(): - raise Exception(req_serializer.errors) + raise BadRequestException(req_serializer.errors) NFManualScaleService(vnfinstid, request.data).start() return Response(data={}, status=status.HTTP_202_ACCEPTED) except Exception as e: @@ -262,13 +301,14 @@ class NfVerifyView(APIView): status.HTTP_409_CONFLICT: "Inner error" } ) + @view_safe_call_with_log(logger) def post(self, request): job_id = "VNFSDK_" + str(uuid.uuid4()) logger.debug("NfVerifyView--post::%s> %s", job_id, request.data) try: req_serializer = VerifyVnfReqSerializer(data=request.data) if not req_serializer.is_valid(): - raise Exception(req_serializer.errors) + raise BadRequestException(req_serializer.errors) VerifyVnfs(request.data, job_id).start() -- 2.16.6