From c46c5bb86671f94e985226c6ac8840cd523e312d Mon Sep 17 00:00:00 2001 From: yangyan Date: Wed, 9 May 2018 09:59:47 +0800 Subject: [PATCH] Fix job progress detection Issue-ID: VFC-901 Change-Id: Ia4050ae7d55755b1740b8385c816152c517d08f2 Signed-off-by: yangyan --- lcm/jobs/serializers.py | 3 ++- lcm/jobs/tests/tests.py | 1 + lcm/jobs/views.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lcm/jobs/serializers.py b/lcm/jobs/serializers.py index 61fa2dda..63e55b30 100644 --- a/lcm/jobs/serializers.py +++ b/lcm/jobs/serializers.py @@ -25,7 +25,8 @@ class JobHistorySerializer(serializers.Serializer): class JobDescriptorSerializer(serializers.Serializer): status = serializers.CharField(help_text="Status of job", required=True) - progress = serializers.CharField(help_text="Progress of job", required=True) + # progress = serializers.CharField(help_text="Progress of job", required=True) + progress = serializers.IntegerField(help_text="Progress of job", required=True) statusDescription = serializers.CharField(help_text="Description of job", required=False, allow_null=True) errorCode = serializers.CharField(help_text="Error code of job", required=False, allow_null=True) responseId = serializers.CharField(help_text="Response index of job", required=True) diff --git a/lcm/jobs/tests/tests.py b/lcm/jobs/tests/tests.py index 84ae29f9..fb260742 100644 --- a/lcm/jobs/tests/tests.py +++ b/lcm/jobs/tests/tests.py @@ -32,6 +32,7 @@ class JobsViewTest(TestCase): self.assertEqual(status.HTTP_200_OK, response.status_code, response.data) self.assertIn('jobId', response.data) self.assertIn('responseDescriptor', response.data) + self.assertEqual(20, response.data['responseDescriptor']['progress']) def test_non_exiting_job(self): job_id = 'test_new_job_id' diff --git a/lcm/jobs/views.py b/lcm/jobs/views.py index 7439b630..8fb6e0ac 100644 --- a/lcm/jobs/views.py +++ b/lcm/jobs/views.py @@ -51,7 +51,8 @@ class JobView(APIView): resp_serializer = JobQueryRespSerializer(data=ret) if not resp_serializer.is_valid(): raise NSLCMException(resp_serializer.errors) - return Response(data=resp_serializer.data, status=status.HTTP_200_OK) + # return Response(data=resp_serializer.data, status=status.HTTP_200_OK) + return Response(data=ret, status=status.HTTP_200_OK) except Exception as e: logger.error(traceback.format_exc()) return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) -- 2.16.6