X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=98b4dcda60a1515b60efa84a2e7672720426ebd3;hb=921a81b28cda4b54375aa184e07cdbd6b57517a8;hp=1062d3a1e3b0bce422eb8ac6d23b040afc4ecb44;hpb=e4f53709988ef82a4afbb53bc34200755eb4a33b;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py index 1062d3a1..98b4dcda 100644 --- a/lcm/lcm/nf/vnfs/views.py +++ b/lcm/lcm/nf/vnfs/views.py @@ -12,15 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import logging -import os import traceback +from drf_yasg.utils import swagger_auto_schema from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView +from lcm.nf.vnfs.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \ + InstOrTeriVnfResponseSerializer, InstantiateVnfRequestSerializer, VnfInfoSerializer, TerminateVnfRequestSerializer from lcm.nf.vnfs.vnf_cancel.delete_vnf_identifier import DeleteVnf from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf @@ -33,98 +34,170 @@ logger = logging.getLogger(__name__) class CreateVnfAndQueryVnfs(APIView): + @swagger_auto_schema( + responses={ + status.HTTP_200_OK: VnfsInfoSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def get(self, request): - logger.debug("QuerySingleVnf--get::> %s" % request.data) + logger.debug("QueryMultiVnf--get::> %s" % request.data) try: resp_data = QueryVnf(request.data).query_multi_vnf() + + vnfs_info_serializer = VnfsInfoSerializer(data=resp_data) + resp_isvalid = vnfs_info_serializer.is_valid() + if not resp_isvalid: + raise NFLCMException(vnfs_info_serializer.errors) + + return Response(data=vnfs_info_serializer.data, status=status.HTTP_200_OK) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) - return Response(data={'error': 'Failed to get Vnfs'}, - status=status.HTTP_500_INTERNAL_SERVER_ERROR) - return Response(data=resp_data, status=status.HTTP_200_OK) - + return Response(data={'error': 'Failed to get Vnfs'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + @swagger_auto_schema( + request_body=CreateVnfReqSerializer(), + responses={ + status.HTTP_201_CREATED: CreateVnfRespSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def post(self, request): logger.debug("CreateVnfIdentifier--post::> %s" % request.data) + req_serializer = CreateVnfReqSerializer(data=request.data) + req_isvalid = req_serializer.is_valid() try: - nf_inst_id = CreateVnf(request.data).do_biz() + if not req_isvalid: + raise NFLCMException(req_serializer.errors) + + nf_inst_id = CreateVnf(req_serializer.data).do_biz() + + create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id}) + resp_isvalid = create_vnf_resp_serializer.is_valid() + if not resp_isvalid: + raise NFLCMException(create_vnf_resp_serializer.errors) + return Response(data=create_vnf_resp_serializer.data, status=status.HTTP_201_CREATED) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except Exception: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - rsp = {"vnfInstanceId": nf_inst_id} - return Response(data=rsp, status=status.HTTP_201_CREATED) class InstantiateVnf(APIView): + @swagger_auto_schema( + request_body=InstantiateVnfRequestSerializer(), + responses={ + status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def post(self, request, instanceid): logger.debug("InstantiateVnf--post::> %s" % request.data) + instantiate_vnf_request_serializer = InstantiateVnfRequestSerializer(data=request.data) + req_isvalid = instantiate_vnf_request_serializer.is_valid() try: + if not req_isvalid: + raise NFLCMException(instantiate_vnf_request_serializer.errors) + job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid) JobUtil.add_job_status(job_id, 0, "INST_VNF_READY") - InstVnf(request.data, instanceid, job_id).start() + InstVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start() + + instantiate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id}) + resp_isvalid = instantiate_vnf_response_serializer.is_valid() + if not resp_isvalid: + raise NFLCMException(instantiate_vnf_response_serializer.errors) + + return Response(data=instantiate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except Exception: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - rsp = {"jobId": job_id} - return Response(data=rsp, status=status.HTTP_202_ACCEPTED) class DeleteVnfAndQueryVnf(APIView): + @swagger_auto_schema( + responses={ + status.HTTP_200_OK: VnfInfoSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def get(self, request, instanceid): logger.debug("QuerySingleVnf--get::> %s" % request.data) try: resp_data = QueryVnf(request.data, instanceid).query_single_vnf() + + vnf_info_serializer = VnfInfoSerializer(data=resp_data) + resp_isvalid = vnf_info_serializer.is_valid() + if not resp_isvalid: + raise NFLCMException(vnf_info_serializer.errors) + + return Response(data=vnf_info_serializer.data, status=status.HTTP_200_OK) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except: + except Exception as e: + logger.eror(e.message) logger.error(traceback.format_exc()) return Response(data={'error': 'Failed to get Vnf(%s)' % instanceid}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - return Response(data=resp_data, status=status.HTTP_200_OK) + @swagger_auto_schema( + responses={ + status.HTTP_204_NO_CONTENT: "Successfully", + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def delete(self, request, instanceid): logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data) try: DeleteVnf(request.data, instanceid).do_biz() + + return Response(data=None, status=status.HTTP_204_NO_CONTENT) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except Exception: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - return Response(data=None, status=status.HTTP_204_NO_CONTENT) class TerminateVnf(APIView): + @swagger_auto_schema( + request_body=TerminateVnfRequestSerializer(), + responses={ + status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) def post(self, request, instanceid): logger.debug("TerminateVnf--post::> %s" % request.data) try: job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid) JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY") TermVnf(request.data, instanceid, job_id).start() + + terminate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id}) + resp_isvalid = terminate_vnf_response_serializer.is_valid() + if not resp_isvalid: + raise NFLCMException(terminate_vnf_response_serializer.errors) + + return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED) except NFLCMException as e: logger.error(e.message) return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except Exception: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - rsp = {"jobId": job_id} - return Response(data=rsp, status=status.HTTP_202_ACCEPTED) - - -class SwaggerJsonView(APIView): - def get(self, request): - json_file = os.path.join(os.path.dirname(__file__), 'swagger.json') - f = open(json_file) - json_data = json.JSONDecoder().decode(f.read()) - f.close() - return Response(json_data)