Decouple response data from serializers

Issue-ID: VFC-1429
Signed-off-by: Olivia.Zhan <zhan.jie1@zte.com.cn>
Change-Id: I74ae9196051124c584e471149a5629cda89c35de

diff --git a/catalog/packages/views/ns_descriptor_views.py b/catalog/packages/views/ns_descriptor_views.py
index 73388ee..3b8c1f9 100644 (file)
--- a/catalog/packages/views/ns_descriptor_views.py
+++ b/catalog/packages/views/ns_descriptor_views.py
@@ -87,14 +87,14 @@ def ns_descriptors_rc(request):
     if request.method == 'POST':
         create_nsd_info_request = validate_data(request.data, CreateNsdInfoRequestSerializer)
         data = NsDescriptor().create(create_nsd_info_request.data)
-        nsd_info = validate_data(data, NsdInfoSerializer)
-        return Response(data=nsd_info.data, status=status.HTTP_201_CREATED)
+        validate_data(data, NsdInfoSerializer)
+        return Response(data=data, status=status.HTTP_201_CREATED)
 
     if request.method == 'GET':
         nsdId = request.query_params.get("nsdId", None)
         data = NsDescriptor().query_multiple(nsdId)
-        nsd_infos = validate_data(data, NsdInfosSerializer)
-        return Response(data=nsd_infos.data, status=status.HTTP_200_OK)
+        validate_data(data, NsdInfosSerializer)
+        return Response(data=data, status=status.HTTP_200_OK)
 
 
 @swagger_auto_schema(

diff --git a/catalog/packages/views/pnf_descriptor_views.py b/catalog/packages/views/pnf_descriptor_views.py
index 0545bfb..9120980 100644 (file)
--- a/catalog/packages/views/pnf_descriptor_views.py
+++ b/catalog/packages/views/pnf_descriptor_views.py
@@ -95,13 +95,13 @@ def pnf_descriptors_rc(request):
     if request.method == 'POST':
         create_pnfd_info_request = validate_data(request.data, CreatePnfdInfoRequestSerializer)
         data = PnfDescriptor().create(create_pnfd_info_request.data)
-        pnfd_info = validate_data(data, PnfdInfoSerializer)
-        return Response(data=pnfd_info.data, status=status.HTTP_201_CREATED)
+        validate_data(data, PnfdInfoSerializer)
+        return Response(data=data, status=status.HTTP_201_CREATED)
 
     if request.method == 'GET':
         data = PnfDescriptor().query_multiple(request)
-        pnfd_infos = validate_data(data, PnfdInfosSerializer)
-        return Response(data=pnfd_infos.data, status=status.HTTP_200_OK)
+        validate_data(data, PnfdInfosSerializer)
+        return Response(data=data, status=status.HTTP_200_OK)
 
 
 @swagger_auto_schema(

diff --git a/catalog/packages/views/vnf_package_views.py b/catalog/packages/views/vnf_package_views.py
index dcff986..9fc143b 100644 (file)
--- a/catalog/packages/views/vnf_package_views.py
+++ b/catalog/packages/views/vnf_package_views.py
@@ -58,16 +58,16 @@ def vnf_packages_rc(request):
     if request.method == 'GET':
         logger.debug("Query VNF packages> %s" % request.data)
         data = VnfPackage().query_multiple()
-        vnf_pkg_infos = validate_data(data, VnfPkgInfosSerializer)
-        return Response(data=vnf_pkg_infos.data, status=status.HTTP_200_OK)
+        validate_data(data, VnfPkgInfosSerializer)
+        return Response(data=data, status=status.HTTP_200_OK)
 
     if request.method == 'POST':
         logger.debug("Create VNF package> %s" % request.data)
         create_vnf_pkg_info_request = validate_data(request.data,
                                                     CreateVnfPkgInfoRequestSerializer)
         data = VnfPackage().create_vnf_pkg(create_vnf_pkg_info_request.data)
-        vnf_pkg_info = validate_data(data, VnfPkgInfoSerializer)
-        return Response(data=vnf_pkg_info.data, status=status.HTTP_201_CREATED)
+        validate_data(data, VnfPkgInfoSerializer)
+        return Response(data=data, status=status.HTTP_201_CREATED)
 
 
 @swagger_auto_schema(
@@ -159,8 +159,8 @@ def vnf_package_rd(request, **kwargs):
     if request.method == 'GET':
         logger.debug("Query an individual VNF package> %s" % request.data)
         data = VnfPackage().query_single(vnf_pkg_id)
-        vnf_pkg_info = validate_data(data, VnfPkgInfoSerializer)
-        return Response(data=vnf_pkg_info.data, status=status.HTTP_200_OK)
+        validate_data(data, VnfPkgInfoSerializer)
+        return Response(data=data, status=status.HTTP_200_OK)
 
     if request.method == 'DELETE':
         logger.debug("Delete an individual VNF package> %s" % request.data)