X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fviews.py;h=b114ee58e4ffa77d7f7a76638d72ee346286b60d;hb=607b3528fc1fae6517c875b3de9ef70250e31275;hp=a97c6169a0ca4389b00bf58f04d8db7a06f32459;hpb=3282ed39a71c360abb21f06636ab58b22c47b5ec;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py index a97c6169..b114ee58 100644 --- a/lcm/lcm/nf/vnfs/views.py +++ b/lcm/lcm/nf/vnfs/views.py @@ -11,15 +11,17 @@ # 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 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, \ + InstantiateVnfResponseSerializer, InstantiateVnfRequestSerializer, VnfInfoSerializer 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 @@ -27,70 +29,128 @@ from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf from lcm.nf.vnfs.vnf_query.query_vnf import QueryVnf from lcm.pub.exceptions import NFLCMException from lcm.pub.utils.jobutil import JobUtil -from lcm.pub.utils.values import ignore_case_get 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() + + 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: + except Exception as e: + logger.error(e.message) logger.error(traceback.format_exc()) - tt = 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() + + resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id}) + resp_isValid = resp_serializer.is_valid() + if not resp_isValid: + raise NFLCMException(resp_serializer.errors) + return Response(data=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: InstantiateVnfResponseSerializer(), + 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: - logger.debug("InstantiateVnf--post::> %s" % request.data) + 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 = InstantiateVnfResponseSerializer(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) - 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() + + 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) - 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) def delete(self, request, instanceid): logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data) @@ -99,7 +159,8 @@ class DeleteVnfAndQueryVnf(APIView): 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) @@ -108,43 +169,18 @@ class DeleteVnfAndQueryVnf(APIView): class TerminateVnf(APIView): def post(self, request, instanceid): logger.debug("TerminateVnf--post::> %s" % request.data) - 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() - rsp = {"jobId": job_id} + 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() + 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': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + rsp = { + "jobId": job_id + } return Response(data=rsp, status=status.HTTP_202_ACCEPTED) - - -class QueryMultipleVnf(APIView): - def get(self, request): - logger.debug("QueryMultipleVnf--get::> %s" % request.data) - return Response(data='', status=status.HTTP_202_ACCEPTED) - -# class QuerySingleVnf(APIView): -# def get(self, request, instanceid): -# logger.debug("QuerySingleVnf--get::> %s" % request.data) -# try: -# resp_data = QueryVnf(request.data, instanceid).query_single_vnf(instanceid) -# except NFLCMException as e: -# logger.error(e.message) -# return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) -# except: -# 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_202_ACCEPTED) - - -# class GetOperationStatus(APIView): -# def get(self, request): -# logger.debug("GetOperationStatus--get::> %s" % request.data) -# return Response(data='', 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)