From 5e1e01e6342d058005e65f649d3b4c7cea513f39 Mon Sep 17 00:00:00 2001 From: yangyan Date: Fri, 11 May 2018 15:42:28 +0800 Subject: [PATCH] Fix get job status error Issue-ID: VFC-908 Change-Id: I16039b39fa52053a8cd7938546c197ec25d9919f Signed-off-by: yangyan --- catalog/pub/utils/jobutil.py | 3 ++- catalog/serializers.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/catalog/pub/utils/jobutil.py b/catalog/pub/utils/jobutil.py index eb19c18d..78983aba 100644 --- a/catalog/pub/utils/jobutil.py +++ b/catalog/pub/utils/jobutil.py @@ -113,7 +113,8 @@ class JobUtil(object): job_status.status = "error" job_status.descp = status_decs - job_status.errcode = error_code + # job_status.errcode = error_code + job_status.errcode = error_code if error_code else "0" job_status.addtime = datetime.datetime.now().strftime('%Y-%m-%d %X') job_status.save() logger.debug("Add a new job status, jobid=%s, indexid=%d," diff --git a/catalog/serializers.py b/catalog/serializers.py index d05e1aee..02fc9de2 100644 --- a/catalog/serializers.py +++ b/catalog/serializers.py @@ -29,7 +29,7 @@ class JobResponseHistoryListSerializer(serializers.Serializer): progress = serializers.CharField(help_text="Job Progress", required=False) statusDescription = serializers.CharField( help_text="Status Description", required=False) - errorCode = serializers.CharField(help_text="Error Code", required=False) + errorCode = serializers.CharField(help_text="Error Code", required=False, allow_null=True) responseId = serializers.CharField(help_text="Response Id", required=False) @@ -38,7 +38,7 @@ class JobResponseDescriptorSerializer(serializers.Serializer): progress = serializers.CharField(help_text="Job Progress", required=False) statusDescription = serializers.CharField( help_text="Status Description", required=False) - errorCode = serializers.CharField(help_text="Error Code", required=False) + errorCode = serializers.CharField(help_text="Error Code", required=False, allow_null=True) responseId = serializers.CharField(help_text="Response Id", required=False) responseHistoryList = JobResponseHistoryListSerializer( many=True, help_text="Response History List", required=False) @@ -69,7 +69,7 @@ class NsPackageDistributeRequestSerializer(serializers.Serializer): class NsPackageDistributeResponseSerializer(serializers.Serializer): status = serializers.CharField(help_text="status", required=True) statusDescription = serializers.CharField(help_text="statusDescription", required=True) - errorCode = serializers.CharField(help_text="errorCode", required=True) + errorCode = serializers.CharField(help_text="errorCode", required=True, allow_null=True) class NsPackageInfoSerializer(serializers.Serializer): -- 2.16.6