X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fcurd_vnf_views.py;h=37e46ff3a7a9b916c74d2283d4031edb53a4ad7b;hb=19c8f17c4191e47cf15dce4d5ed48716a1c78c59;hp=16d082c6541d6c6ab64b7e3fe65f1f75c84fe76e;hpb=5856d335c0ed0f256fa186373af7165cecb879a6;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py index 16d082c6..37e46ff3 100644 --- a/lcm/lcm/nf/views/curd_vnf_views.py +++ b/lcm/lcm/nf/views/curd_vnf_views.py @@ -13,19 +13,27 @@ # limitations under the License. import logging -import traceback from drf_yasg.utils import swagger_auto_schema -from lcm.nf.biz.delete_vnf import DeleteVnf from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView from lcm.nf.biz.create_vnf import CreateVnf from lcm.nf.biz.query_vnf import QueryVnf -from lcm.nf.serializers.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \ - VnfInfoSerializer +from lcm.nf.biz.update_vnf import UpdateVnf +from lcm.nf.biz.delete_vnf import DeleteVnf +from lcm.nf.serializers.create_vnf_req import CreateVnfReqSerializer +from lcm.nf.serializers.vnf_instance import VnfInstanceSerializer +from lcm.nf.serializers.vnf_instances import VnfInstancesSerializer +from lcm.nf.serializers.vnf_info_modifications import VnfInfoModificationsSerializer from lcm.pub.exceptions import NFLCMException +from lcm.nf.const import VNF_STATUS +from lcm.nf.const import OPERATION_TYPE +from .common import view_safe_call_with_log +from .common import deal_vnf_action +from .common import deal_indivdual_query +from lcm.pub.exceptions import NFLCMExceptionBadRequest logger = logging.getLogger(__name__) @@ -33,83 +41,70 @@ logger = logging.getLogger(__name__) class CreateVnfAndQueryVnfs(APIView): @swagger_auto_schema( responses={ - status.HTTP_200_OK: VnfsInfoSerializer(), + status.HTTP_200_OK: VnfInstancesSerializer(), status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) + @view_safe_call_with_log(logger=logger) def get(self, request): logger.debug("QueryMultiVnf--get::> %s" % request.data) - try: - resp_data = QueryVnf(request.data).query_multi_vnf() - - vnfs_info_serializer = VnfsInfoSerializer(data=resp_data) - if not vnfs_info_serializer.is_valid(): - 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 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) + resp_data = QueryVnf(request.data).query_multi_vnf() + if len(resp_data) == 0: + return Response(data=[], status=status.HTTP_200_OK) + vnf_instances_serializer = VnfInstancesSerializer(data=resp_data) + if not vnf_instances_serializer.is_valid(): + raise NFLCMException(vnf_instances_serializer.errors) + + return Response(data=resp_data, status=status.HTTP_200_OK) @swagger_auto_schema( request_body=CreateVnfReqSerializer(), responses={ - status.HTTP_201_CREATED: CreateVnfRespSerializer(), + status.HTTP_201_CREATED: VnfInstanceSerializer(), + status.HTTP_400_BAD_REQUEST: "Bad Request", status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) + @view_safe_call_with_log(logger=logger) def post(self, request): logger.debug("CreateVnfIdentifier--post::> %s" % request.data) - try: - req_serializer = CreateVnfReqSerializer(data=request.data) - if not req_serializer.is_valid(): - raise NFLCMException(req_serializer.errors) - - resp = CreateVnf(req_serializer.data).do_biz() - nf_inst_id = resp.get('id', 'undefined') - - create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id}) - if not create_vnf_resp_serializer.is_valid(): - 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 as e: - logger.error(e.message) - logger.error(traceback.format_exc()) - return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + req_serializer = CreateVnfReqSerializer(data=request.data) + if not req_serializer.is_valid(): + raise NFLCMExceptionBadRequest(req_serializer.errors) + + nf_inst = CreateVnf(request.data).do_biz() + rsp_data = {"id": nf_inst.nfinstid, + "vnfInstanceName": nf_inst.nf_name, + "vnfdId": nf_inst.vnfdid, + "vnfProvider": nf_inst.vendor, + "vnfSoftwareVersion": nf_inst.vnfSoftwareVersion, + "vnfdVersion": nf_inst.version, + "vnfPkgId": nf_inst.package_id, + "instantiationState": nf_inst.status, + "vnfInstanceDescription": nf_inst.nf_desc + } + create_vnf_resp_serializer = VnfInstanceSerializer(data=rsp_data) + if not create_vnf_resp_serializer.is_valid(): + raise NFLCMException(create_vnf_resp_serializer.errors) + + return Response(data=rsp_data, status=status.HTTP_201_CREATED) class DeleteVnfAndQueryVnf(APIView): @swagger_auto_schema( responses={ - status.HTTP_200_OK: VnfInfoSerializer(), + status.HTTP_200_OK: VnfInstanceSerializer(), status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) + @view_safe_call_with_log(logger=logger) 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) - if not vnf_info_serializer.is_valid(): - 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 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 deal_indivdual_query(res_serializer=VnfInstanceSerializer, + query_fun=QueryVnf( + request.data, + instanceid).query_single_vnf) @swagger_auto_schema( responses={ @@ -117,16 +112,29 @@ class DeleteVnfAndQueryVnf(APIView): status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) + @view_safe_call_with_log(logger=logger) 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 as e: - logger.error(e.message) - logger.error(traceback.format_exc()) - return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + logger.debug("DeleteVnfIdentifier--delete::> %s" % instanceid) + + DeleteVnf(request.data, instanceid).do_biz() + + return Response(data=None, status=status.HTTP_204_NO_CONTENT) + + @swagger_auto_schema( + request_body=VnfInfoModificationsSerializer(), + responses={ + status.HTTP_202_ACCEPTED: "Successfully", + status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" + } + ) + @view_safe_call_with_log(logger=logger) + def patch(self, request, instanceid): + return deal_vnf_action( + logger=logger, + opt_type=OPERATION_TYPE.MODIFY_INFO, + opt_status=VNF_STATUS.UPDATING, + instid=instanceid, + req=request, + req_serializer=VnfInfoModificationsSerializer, + act_task=UpdateVnf + )