Fix incorrect class of swagger code. 19/29119/2
authorfengyuanxing <feng.yuanxing@zte.com.cn>
Thu, 25 Jan 2018 06:44:54 +0000 (14:44 +0800)
committeryunlong ying <ying.yunlong@zte.com.cn>
Thu, 25 Jan 2018 09:18:17 +0000 (09:18 +0000)
Change-Id: I355481443e12466af8b964eb819f26fd0e006c20
Issue-ID: VFC-677
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
catalog/jobs/views.py
catalog/serializers.py

index 16ade90..4d49dc3 100644 (file)
@@ -23,7 +23,8 @@ from catalog.jobs.job_get import GetJobInfoService
 from catalog.pub.utils.jobutil import JobUtil
 from catalog.pub.utils.values import ignore_case_get
 from catalog.serializers import JobResponseSerializer
-from catalog.serializers import PostJobResponseSerializer
+from catalog.serializers import PostJobResponseResultSerializer
+from catalog.serializers import PostJobRequestSerializer
 
 logger = logging.getLogger(__name__)
 
@@ -43,11 +44,12 @@ class JobView(APIView):
         return Response(data=ret, status=status.HTTP_200_OK)
 
     @swagger_auto_schema(
+        request_body=PostJobRequestSerializer(),
         operation_description="Update job status",
-        manual_parameters=[input_job_id, input_response_id],
+        manual_parameters=[input_job_id],
         responses={
-            status.HTTP_202_ACCEPTED: PostJobResponseSerializer(),
-            status.HTTP_500_INTERNAL_SERVER_ERROR: PostJobResponseSerializer()
+            status.HTTP_202_ACCEPTED: PostJobResponseResultSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: PostJobResponseResultSerializer()
         }
     )
     def post(self, request, job_id):
index d7673e6..647301e 100644 (file)
@@ -18,7 +18,7 @@ from catalog.pub.utils.toscaparser.nsdmodel import EtsiNsdInfoModel
 from catalog.pub.utils.toscaparser.vnfdmodel import EtsiVnfdInfoModel
 
 
-class JobResponseSerializer(serializers.Serializer):
+class PostJobRequestSerializer(serializers.Serializer):
     progress = serializers.CharField(help_text="Job Progress", required=False)
     desc = serializers.CharField(help_text="Description", required=False)
     errcode = serializers.CharField(help_text="Error Code", required=False)
@@ -44,7 +44,7 @@ class JobResponseDescriptorSerializer(serializers.Serializer):
         many=True, help_text="Response History List", required=False)
 
 
-class JobRequestSerializer(serializers.Serializer):
+class JobResponseSerializer(serializers.Serializer):
     jobId = serializers.CharField(
         help_text="Job Id",
         required=False)