From ca977b3bfaa4dfb1672155d447ff456f2a374944 Mon Sep 17 00:00:00 2001 From: fengyuanxing Date: Mon, 29 Jan 2018 10:20:14 +0800 Subject: [PATCH] Modify incorrect schema of parsing model swagger Change-Id: I78bdb667c039b2271e1e08acca2580a3fb715daa Issue-ID: VFC-685 Signed-off-by: fengyuanxing --- catalog/packages/views.py | 8 ++++---- catalog/serializers.py | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/catalog/packages/views.py b/catalog/packages/views.py index eccac3b8..78ba4a49 100644 --- a/catalog/packages/views.py +++ b/catalog/packages/views.py @@ -26,8 +26,8 @@ from catalog.serializers import NfPackagesSerializer from catalog.serializers import NfPackageDistributeRequestSerializer from catalog.serializers import PostJobResponseSerializer from catalog.serializers import ParseModelRequestSerializer -from catalog.serializers import ParseNfPackageResponseSerializer -from catalog.serializers import ParseNSPackageResponseSerializer +from catalog.serializers import ParseModelResponseSerializer + from drf_yasg import openapi from drf_yasg.utils import no_body, swagger_auto_schema @@ -208,7 +208,7 @@ def nf_rd_csar(request, *args, **kwargs): operation_description="Parse NS model", request_body=ParseModelRequestSerializer, responses={ - status.HTTP_202_ACCEPTED: ParseNSPackageResponseSerializer, + status.HTTP_202_ACCEPTED: ParseModelResponseSerializer, status.HTTP_500_INTERNAL_SERVER_ERROR: openapi.Response( 'error', openapi.Schema( @@ -237,7 +237,7 @@ def ns_model_parser(request, *args, **kwargs): operation_description="Parse Nf model", request_body=ParseModelRequestSerializer, responses={ - status.HTTP_202_ACCEPTED: ParseNfPackageResponseSerializer, + status.HTTP_202_ACCEPTED: ParseModelResponseSerializer, status.HTTP_500_INTERNAL_SERVER_ERROR: openapi.Response( 'error', openapi.Schema( diff --git a/catalog/serializers.py b/catalog/serializers.py index 57fcc976..820dc003 100644 --- a/catalog/serializers.py +++ b/catalog/serializers.py @@ -171,6 +171,10 @@ class ParseModelRequestSerializer(serializers.Serializer): inputs = serializers.JSONField(help_text="Inputs", required=False) +class ParseModelResponseSerializer(serializers.Serializer): + model = serializers.JSONField(help_text="Model", required=True) + + class EtsiNsdInfoModelSerializer(serializers.ModelSerializer): class Meta: -- 2.16.6