X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=97448812421a4767d7a70bdddceae15b5fb6e473;hb=8f419382660590a85744d34c1532b5db3699fff6;hp=1980fd4801fff1be15621f8970f102326e5f977a;hpb=aef65f5c0950526a7fb484a8472f20958660f04e;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py index 1980fd48..97448812 100644 --- a/lcm/lcm/nf/vnfs/views.py +++ b/lcm/lcm/nf/vnfs/views.py @@ -20,7 +20,8 @@ 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 +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,19 +34,30 @@ 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("QueryMultiVnf--get::> %s" % request.data) try: resp_data = QueryVnf(request.data).query_multi_vnf() + + vnfsInfoSerializer = VnfsInfoSerializer(data=resp_data) + resp_isValid = vnfsInfoSerializer.is_valid() + if not resp_isValid: + raise NFLCMException(vnfsInfoSerializer.errors) + + return Response(data=vnfsInfoSerializer.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 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(), @@ -63,10 +75,8 @@ class CreateVnfAndQueryVnfs(APIView): raise NFLCMException(req_serializer.errors) nf_inst_id = CreateVnf(req_serializer.data).do_biz() - rsp = { - "vnfInstanceId": nf_inst_id - } - resp_serializer = CreateVnfRespSerializer(data=rsp) + + resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id}) resp_isValid = resp_serializer.is_valid() if not resp_isValid: raise NFLCMException(resp_serializer.errors) @@ -81,12 +91,31 @@ class CreateVnfAndQueryVnfs(APIView): 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) + instantiateVnfRequestSerializer = InstantiateVnfRequestSerializer(data=request.data) + req_isValid = instantiateVnfRequestSerializer.is_valid() try: + if not req_isValid: + raise NFLCMException(instantiateVnfRequestSerializer.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(instantiateVnfRequestSerializer.data, instanceid, job_id).start() + + instantiateVnfResponseSerializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id}) + resp_isValid = instantiateVnfResponseSerializer.is_valid() + if not resp_isValid: + raise NFLCMException(instantiateVnfResponseSerializer.errors) + + return Response(data=instantiateVnfResponseSerializer.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) @@ -94,17 +123,26 @@ class InstantiateVnf(APIView): 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() + + vnfInfoSerializer = VnfInfoSerializer(data=resp_data) + resp_isValid = vnfInfoSerializer.is_valid() + if not resp_isValid: + raise NFLCMException(vnfInfoSerializer.errors) + + return Response(data=vnfInfoSerializer.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) @@ -113,12 +151,19 @@ class DeleteVnfAndQueryVnf(APIView): 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) @@ -126,16 +171,29 @@ class DeleteVnfAndQueryVnf(APIView): 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() + + terminateVnfResponseSerializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id}) + resp_isValid = terminateVnfResponseSerializer.is_valid() + if not resp_isValid: + raise NFLCMException(terminateVnfResponseSerializer.errors) + + return Response(data=terminateVnfResponseSerializer.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) @@ -143,7 +201,3 @@ class TerminateVnf(APIView): 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)