update for change to etsicatalog

[modeling/etsicatalog.git] / catalog / packages / views / vnf_package_views.py

diff --git a/genericparser/packages/views/vnf_package_views.py b/catalog/packages/views/vnf_package_views.py
similarity index 83%
rename from genericparser/packages/views/vnf_package_views.py
rename to catalog/packages/views/vnf_package_views.py
index bfb1224..9fc143b 100644 (file)
--- a/genericparser/packages/views/vnf_package_views.py
+++ b/catalog/packages/views/vnf_package_views.py
@@ -19,14 +19,15 @@ from drf_yasg.utils import swagger_auto_schema, no_body
 from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
-from genericparser.packages.serializers.upload_vnf_pkg_from_uri_req import UploadVnfPackageFromUriRequestSerializer
-from genericparser.packages.serializers.create_vnf_pkg_info_req import CreateVnfPkgInfoRequestSerializer
-from genericparser.packages.serializers.vnf_pkg_info import VnfPkgInfoSerializer
-from genericparser.packages.serializers.vnf_pkg_infos import VnfPkgInfosSerializer
-from genericparser.packages.biz.vnf_package import VnfPackage
-from genericparser.packages.biz.vnf_package import VnfPkgUploadThread
-from genericparser.packages.biz.vnf_package import parse_vnfd_and_save
-from genericparser.packages.biz.vnf_package import handle_upload_failed
+
+from catalog.packages.serializers.upload_vnf_pkg_from_uri_req import UploadVnfPackageFromUriRequestSerializer
+from catalog.packages.serializers.create_vnf_pkg_info_req import CreateVnfPkgInfoRequestSerializer
+from catalog.packages.serializers.vnf_pkg_info import VnfPkgInfoSerializer
+from catalog.packages.serializers.vnf_pkg_infos import VnfPkgInfosSerializer
+from catalog.packages.biz.vnf_package import VnfPackage
+from catalog.packages.biz.vnf_package import VnfPkgUploadThread
+from catalog.packages.biz.vnf_package import parse_vnfd_and_save
+from catalog.packages.biz.vnf_package import handle_upload_failed
 from .common import validate_data
 from .common import view_safe_call_with_log
 
@@ -57,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(
@@ -158,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)