From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Tue, 30 Jan 2018 07:06:28 +0000 (+0800)
Subject: Modify code of distributing ns package
X-Git-Tag: v1.1.0~54
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c1ea84d3ff8853a6cd99a347d4fb4de47b1f1028;p=vfc%2Fnfvo%2Fcatalog.git

Modify code of distributing ns package

Change-Id: Ib5660be880ebfe3bf244665dc1f346a5b3219458
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 f9e9cabf..cc8b4a3c 100644
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -23,6 +23,7 @@ from catalog.packages import nf_package
 from catalog.packages import ns_package
 from catalog.serializers import NsPackagesSerializer
 from catalog.serializers import NfPackagesSerializer
+from catalog.serializers import NsPackageDistributeRequestSerializer
 from catalog.serializers import NfPackageDistributeRequestSerializer
 from catalog.serializers import NfPackageSerializer
 from catalog.serializers import ParseModelRequestSerializer
@@ -39,7 +40,7 @@ logger = logging.getLogger(__name__)
 @swagger_auto_schema(
     method='POST',
     operation_description="On distribute NS package",
-    request_body=no_body,
+    request_body=NsPackageDistributeRequestSerializer,
     responses={
         status.HTTP_202_ACCEPTED: openapi.Response(
             'return code',
@@ -72,6 +73,11 @@ def nspackages_rc(request, *args, **kwargs):
                 return validation_error
     elif request.method == 'POST':
         # Distributes the package accroding to the given csarId
+        request_serializer = NsPackageDistributeRequestSerializer(data=request.data)
+        validation_error = handleValidatonError(request_serializer, True)
+        if validation_error:
+            return validation_error
+
         csar_id = ignore_case_get(request.data, "csarId")
         logger.debug("csar_id is %s", csar_id)
         ret = ns_package.ns_on_distribute(csar_id)