From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Fri, 9 Feb 2018 06:44:23 +0000 (+0800)
Subject: Modify swagger code for ns package
X-Git-Tag: v1.1.0~44
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F30981%2F1;p=vfc%2Fnfvo%2Fcatalog.git

Modify swagger code for ns package

Change-Id: I439515f8b21ff7acc2c2126a7e4d83a8ec920ed7
Issue-ID: VFC-685
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---

diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index 2841c10f..26ed83bf 100644
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -25,6 +25,7 @@ from catalog.serializers import NsPackagesSerializer
 from catalog.serializers import NsPackageSerializer
 from catalog.serializers import NfPackagesSerializer
 from catalog.serializers import NsPackageDistributeRequestSerializer
+from catalog.serializers import NsPackageDistributeResponseSerializer
 from catalog.serializers import NfPackageDistributeRequestSerializer
 from catalog.serializers import NfPackageSerializer
 from catalog.serializers import ParseModelRequestSerializer
@@ -43,11 +44,7 @@ logger = logging.getLogger(__name__)
     operation_description="On distribute NS package",
     request_body=NsPackageDistributeRequestSerializer,
     responses={
-        status.HTTP_202_ACCEPTED: openapi.Response(
-            'return code',
-            openapi.Schema(
-                type=openapi.TYPE_STRING,
-                pattern='CSAR(\w+) distributed successfully.')),
+        status.HTTP_202_ACCEPTED: NsPackageDistributeResponseSerializer,
         status.HTTP_500_INTERNAL_SERVER_ERROR: InternalErrorRequestSerializer})
 @swagger_auto_schema(
     method='GET',
diff --git a/catalog/serializers.py b/catalog/serializers.py
index d44e21cc..d05e1aee 100644
--- a/catalog/serializers.py
+++ b/catalog/serializers.py
@@ -66,6 +66,12 @@ class NsPackageDistributeRequestSerializer(serializers.Serializer):
     csarId = serializers.CharField(help_text="csarId", required=True)
 
 
+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)
+
+
 class NsPackageInfoSerializer(serializers.Serializer):
     nsdId = serializers.CharField(help_text="NSD ID", required=True)
     nsPackageId = serializers.CharField(