From: laili Date: Thu, 23 Aug 2018 05:16:36 +0000 (+0800) Subject: Ns descriptor related stuffs. X-Git-Tag: 1.2.0~75^2~8 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F61967%2F1;p=vfc%2Fnfvo%2Fcatalog.git Ns descriptor related stuffs. Rename tests and delete useless views. Change-Id: Ia2683c43cc262771cde8592214daeeffca3a750d Issue-ID: VFC-1037 Signed-off-by: laili --- 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 index c5134cde..00000000 --- a/catalog/packages/views/nsd_views.py +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from drf_yasg.utils import swagger_auto_schema -from rest_framework import status -from rest_framework.views import APIView - - -class ns_descriptors(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class ns_info(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class nsd_content(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class pnf_descriptors(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class pnfd_info(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class pnfd_content(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class nsd_subscriptions(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class nsd_subscription(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None diff --git a/catalog/packages/views/vnfpkg_views.py b/catalog/packages/views/vnfpkg_views.py deleted file mode 100644 index 9f1bbc9f..00000000 --- a/catalog/packages/views/vnfpkg_views.py +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import logging - -from drf_yasg.utils import swagger_auto_schema -from rest_framework import status -from rest_framework.views import APIView - - -logger = logging.getLogger(__name__) - - -class vnf_package(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class vnfd(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class artifacts(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class vnfpkg_subscriptions(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None - - -class vnfpkg_subscription(APIView): - @swagger_auto_schema( - responses={ - # status.HTTP_200_OK: Serializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def get(self, request): - # TODO - return None - - @swagger_auto_schema( - # request_body=CreateVnfReqSerializer(), - responses={ - # status.HTTP_201_CREATED: CreateVnfRespSerializer(), - status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" - } - ) - def post(self, request): - # TODO - return None