aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfengyuanxing <feng.yuanxing@zte.com.cn>2018-01-25 14:44:54 +0800
committeryunlong ying <ying.yunlong@zte.com.cn>2018-01-25 09:18:17 +0000
commit14531852c471291a0631186c9d96c587df3ab0be (patch)
tree850e69692a4b229bf72a194eb55799ce8fdc9ec4
parentde19b9a3a77d77249b3a43b221a02d8f278a1119 (diff)
Fix incorrect class of swagger code.
Change-Id: I355481443e12466af8b964eb819f26fd0e006c20 Issue-ID: VFC-677 Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
-rw-r--r--catalog/jobs/views.py10
-rw-r--r--catalog/serializers.py4
2 files changed, 8 insertions, 6 deletions
diff --git a/catalog/jobs/views.py b/catalog/jobs/views.py
index 16ade90c..4d49dc3a 100644
--- a/catalog/jobs/views.py
+++ b/catalog/jobs/views.py
@@ -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):
diff --git a/catalog/serializers.py b/catalog/serializers.py
index d7673e60..647301ed 100644
--- a/catalog/serializers.py
+++ b/catalog/serializers.py
@@ -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)