X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fviews%2Fpnf_descriptor_views.py;fp=genericparser%2Fpackages%2Fviews%2Fpnf_descriptor_views.py;h=91209803248c109c41d6ccc0909fc7bd97269927;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=7abd8ad85cc32e64e873164d63169cb514be3dcb;hpb=431a5a35a8e0a26d21c663167303696db8a7a2a6;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/views/pnf_descriptor_views.py b/catalog/packages/views/pnf_descriptor_views.py
similarity index 82%
rename from genericparser/packages/views/pnf_descriptor_views.py
rename to catalog/packages/views/pnf_descriptor_views.py
index 7abd8ad..9120980 100644
--- a/genericparser/packages/views/pnf_descriptor_views.py
+++ b/catalog/packages/views/pnf_descriptor_views.py
@@ -20,17 +20,17 @@ from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from genericparser.packages.biz.pnf_descriptor import PnfDescriptor
-from genericparser.packages.serializers.create_pnfd_info_request import CreatePnfdInfoRequestSerializer
-from genericparser.packages.serializers.pnfd_info import PnfdInfoSerializer
-from genericparser.packages.serializers.pnfd_infos import PnfdInfosSerializer
-from genericparser.packages.views.common import validate_data
-from genericparser.packages.serializers.genericparser_serializers import ParseModelRequestSerializer
-from genericparser.packages.serializers.genericparser_serializers import ParseModelResponseSerializer
-from genericparser.packages.serializers.genericparser_serializers import InternalErrorRequestSerializer
-from genericparser.packages.serializers.response import ProblemDetailsSerializer
-from genericparser.pub.utils.syscomm import fun_name
-from genericparser.pub.utils.values import ignore_case_get
+from catalog.packages.biz.pnf_descriptor import PnfDescriptor
+from catalog.packages.serializers.create_pnfd_info_request import CreatePnfdInfoRequestSerializer
+from catalog.packages.serializers.pnfd_info import PnfdInfoSerializer
+from catalog.packages.serializers.pnfd_infos import PnfdInfosSerializer
+from catalog.packages.views.common import validate_data
+from catalog.packages.serializers.catalog_serializers import ParseModelRequestSerializer
+from catalog.packages.serializers.catalog_serializers import ParseModelResponseSerializer
+from catalog.packages.serializers.catalog_serializers import InternalErrorRequestSerializer
+from catalog.packages.serializers.response import ProblemDetailsSerializer
+from catalog.pub.utils.syscomm import fun_name
+from catalog.pub.utils.values import ignore_case_get
 from .common import view_safe_call_with_log
 
 logger = logging.getLogger(__name__)
@@ -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(