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

diff --git a/genericparser/packages/views/ns_descriptor_views.py b/catalog/packages/views/ns_descriptor_views.py
similarity index 85%
rename from genericparser/packages/views/ns_descriptor_views.py
rename to catalog/packages/views/ns_descriptor_views.py
index bbe51ea..3b8c1f9 100644
--- a/genericparser/packages/views/ns_descriptor_views.py
+++ b/catalog/packages/views/ns_descriptor_views.py
@@ -20,12 +20,12 @@ from rest_framework import status
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
-from genericparser.packages.biz.ns_descriptor import NsDescriptor
-from genericparser.packages.serializers.create_nsd_info_request import CreateNsdInfoRequestSerializer
-from genericparser.packages.serializers.nsd_info import NsdInfoSerializer
-from genericparser.packages.serializers.nsd_infos import NsdInfosSerializer
-from genericparser.packages.views.common import validate_data
-from genericparser.pub.exceptions import GenericparserException
+from catalog.packages.biz.ns_descriptor import NsDescriptor
+from catalog.packages.serializers.create_nsd_info_request import CreateNsdInfoRequestSerializer
+from catalog.packages.serializers.nsd_info import NsdInfoSerializer
+from catalog.packages.serializers.nsd_infos import NsdInfosSerializer
+from catalog.packages.views.common import validate_data
+from catalog.pub.exceptions import CatalogException
 from .common import view_safe_call_with_log
 
 logger = logging.getLogger(__name__)
@@ -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(
@@ -126,7 +126,7 @@ def nsd_content_ru(request, **kwargs):
             local_file_name = NsDescriptor().upload(nsd_info_id, files[0])
             NsDescriptor().parse_nsd_and_save(nsd_info_id, local_file_name)
             return Response(data=None, status=status.HTTP_204_NO_CONTENT)
-        except GenericparserException as e:
+        except CatalogException as e:
             NsDescriptor().handle_upload_failed(nsd_info_id)
             raise e
         except Exception as e: