From eb0f507069a4827bea3b1d22013459db09d6c1a0 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Fri, 26 Jan 2018 09:10:47 +0800 Subject: [PATCH] Merge Ns operate resp serializer Change-Id: I03b11f009d05d2ad7b2c9c80d8c3d0e5f22e0636 Issue-ID: VFC-680 Signed-off-by: fujinhua --- lcm/ns/serializers.py | 4 ++-- lcm/ns/views.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lcm/ns/serializers.py b/lcm/ns/serializers.py index 236731e6..dd56e6bd 100644 --- a/lcm/ns/serializers.py +++ b/lcm/ns/serializers.py @@ -84,8 +84,8 @@ class InstantNsReqSerializer(serializers.Serializer): additionalParamForNs = serializers.CharField(help_text="Additional param for NS", required=False, allow_null=True) -class InstantNsRespSerializer(serializers.Serializer): - jobId = serializers.CharField(help_text="ID of NS instant job", required=True) +class NsOperateJobSerializer(serializers.Serializer): + jobId = serializers.CharField(help_text="ID of NS operate job", required=True) class TerminateNsReqSerializer(serializers.Serializer): diff --git a/lcm/ns/views.py b/lcm/ns/views.py index 347d2fb1..3905faae 100644 --- a/lcm/ns/views.py +++ b/lcm/ns/views.py @@ -34,7 +34,7 @@ from lcm.pub.utils.restcall import req_by_msb from lcm.pub.utils.values import ignore_case_get from lcm.ns.serializers import CreateNsReqSerializer, CreateNsRespSerializer from lcm.ns.serializers import QueryNsRespSerializer -from lcm.ns.serializers import InstantNsReqSerializer, InstantNsRespSerializer +from lcm.ns.serializers import InstantNsReqSerializer, NsOperateJobSerializer from lcm.pub.exceptions import NSLCMException logger = logging.getLogger(__name__) @@ -104,7 +104,7 @@ class NSInstView(APIView): @swagger_auto_schema( request_body=InstantNsReqSerializer(), responses={ - status.HTTP_200_OK: InstantNsRespSerializer(), + status.HTTP_200_OK: NsOperateJobSerializer(), status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error" } ) @@ -115,7 +115,7 @@ class NSInstView(APIView): return Response({'error': req_serializer.errors}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) ack = InstantNSService(ns_instance_id, request.data).do_biz() - resp_serializer = InstantNsRespSerializer(data=ack['data']) + resp_serializer = NsOperateJobSerializer(data=ack['data']) if not resp_serializer.is_valid(): return Response({'error': resp_serializer.errors}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) -- 2.16.6