Ns descriptor related stuffs.

Rename tests and delete useless views.

Change-Id: Ia2683c43cc262771cde8592214daeeffca3a750d
Issue-ID: VFC-1037
Signed-off-by: laili <lai.li@zte.com.cn>

diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_nspackage.py
similarity index 100%
rename from catalog/packages/tests/test_ns.py
rename to catalog/packages/tests/test_nspackage.py

diff --git a/catalog/packages/tests/test_nf.py b/catalog/packages/tests/test_vnfpackage.py
similarity index 100%
rename from catalog/packages/tests/test_nf.py
rename to catalog/packages/tests/test_vnfpackage.py

diff --git a/catalog/packages/views/nsd_views.py b/catalog/packages/views/nsd_views.py
deleted file mode 100644 (file)
index c5134cd..0000000
--- a/catalog/packages/views/nsd_views.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 2017 ZTE Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-from drf_yasg.utils import swagger_auto_schema\r
-from rest_framework import status\r
-from rest_framework.views import APIView\r
-\r
-\r
-class ns_descriptors(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class ns_info(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class nsd_content(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class pnf_descriptors(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class pnfd_info(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class pnfd_content(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class nsd_subscriptions(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class nsd_subscription(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r

diff --git a/catalog/packages/views/vnfpkg_views.py b/catalog/packages/views/vnfpkg_views.py
deleted file mode 100644 (file)
index 9f1bbc9..0000000
--- a/catalog/packages/views/vnfpkg_views.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2017 ZTE Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-import logging\r
-\r
-from drf_yasg.utils import swagger_auto_schema\r
-from rest_framework import status\r
-from rest_framework.views import APIView\r
-\r
-\r
-logger = logging.getLogger(__name__)\r
-\r
-\r
-class vnf_package(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class vnfd(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class artifacts(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class vnfpkg_subscriptions(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r
-\r
-\r
-class vnfpkg_subscription(APIView):\r
-    @swagger_auto_schema(\r
-        responses={\r
-            # status.HTTP_200_OK: Serializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def get(self, request):\r
-        # TODO\r
-        return None\r
-\r
-    @swagger_auto_schema(\r
-        # request_body=CreateVnfReqSerializer(),\r
-        responses={\r
-            #     status.HTTP_201_CREATED: CreateVnfRespSerializer(),\r
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"\r
-        }\r
-    )\r
-    def post(self, request):\r
-        # TODO\r
-        return None\r