resolve job issues

[vfc/nfvo/lcm.git] / lcm / jobs / views.py

diff --git a/lcm/jobs/views.py b/lcm/jobs/views.py
index 3079c16..2518b3c 100644 (file)
--- a/lcm/jobs/views.py
+++ b/lcm/jobs/views.py
@@ -20,7 +20,7 @@ from rest_framework.views import APIView
 from rest_framework import status
 from drf_yasg.utils import swagger_auto_schema
 
-from lcm.pub.enum import JOB_ERROR_CODE
+from lcm.jobs.enum import JOB_ERROR_CODE
 from lcm.jobs.job_get import GetJobInfoService
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.jobs.api_model import JobUpdReq, JobUpdResp
@@ -41,7 +41,7 @@ class JobView(APIView):
     input_response_id = openapi.Parameter(
         'responseId',
         openapi.IN_QUERY,
-        description="response id",
+        description="job response id",
         type=openapi.TYPE_STRING)
 
     @swagger_auto_schema(
@@ -49,17 +49,19 @@ class JobView(APIView):
         manual_parameters=[input_job_id, input_response_id],
         responses={
             status.HTTP_200_OK: JobQueryRespSerializer(),
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "HTTP_500_INTERNAL_SERVER_ERROR"
         }
     )
     def get(self, request, job_id):
         try:
+            logger.debug("Enter JobView::get, job_id: %s, request= %s ", job_id, request.data)
             response_id = int(request.GET.get('responseId', 0))
             ret = GetJobInfoService(job_id, response_id).do_biz()
             resp_serializer = JobQueryRespSerializer(data=ret)
             if not resp_serializer.is_valid():
                 raise NSLCMException(resp_serializer.errors)
-            return Response(data=ret, status=status.HTTP_200_OK)
+            logger.debug("Leave JobView::get, response=%s", resp_serializer.data)
+            return Response(data=resp_serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response(data={'error': e.args[0]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -74,15 +76,14 @@ class JobView(APIView):
     )
     def post(self, request, job_id):
         try:
-            logger.debug("Enter JobView:post, %s, %s ", job_id, request.data)
-
+            logger.debug("Enter JobView:post, job_id=%s, request=%s", job_id, request.data)
             req_serializer = JobUpdReqSerializer(data=request.data)
             if not req_serializer.is_valid():
                 raise BadRequestException(req_serializer.errors)
 
             jobs = JobUtil.query_job_status(job_id)
             if not jobs:
-                raise NSLCMException("Job(%s) does not exist." % job_id)
+                raise BadRequestException("Job(%s) does not exist." % job_id)
 
             if jobs[-1].errcode != JOB_ERROR_CODE.ERROR:
                 job_up_req = JobUpdReq(**request.data)
@@ -92,8 +93,9 @@ class JobView(APIView):
                 JobUtil.add_job_status(job_id, job_up_req.progress, desc, error_code=errcode)
             job_update_resp = JobUpdResp('ok')
             resp_serializer = JobUpdRespSerializer(job_update_resp)
+            logger.debug("Leave JobView::post, response=%s", resp_serializer.data)
             return Response(data=resp_serializer.data, status=status.HTTP_202_ACCEPTED)
-        except NSLCMException as e:
+        except BadRequestException as e:
             job_update_resp = JobUpdResp('error', e.args[0])
             resp_serializer = JobUpdRespSerializer(job_update_resp)
             return Response(data=resp_serializer.data, status=status.HTTP_400_BAD_REQUEST)