X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fcurd_vnf_views.py;h=37e46ff3a7a9b916c74d2283d4031edb53a4ad7b;hb=refs%2Fheads%2Felalto;hp=e8c19d6727042f400c5cd5fabed24d0e8274ef91;hpb=46ad7c172411214c5432ed93fda4271288077447;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 e8c19d67..37e46ff3 100644 --- a/lcm/lcm/nf/views/curd_vnf_views.py +++ b/lcm/lcm/nf/views/curd_vnf_views.py @@ -33,6 +33,7 @@ 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__) @@ -60,6 +61,7 @@ class CreateVnfAndQueryVnfs(APIView): request_body=CreateVnfReqSerializer(), responses={ status.HTTP_201_CREATED: VnfInstanceSerializer(), + status.HTTP_400_BAD_REQUEST: "Bad Request", status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) @@ -68,14 +70,19 @@ class CreateVnfAndQueryVnfs(APIView): logger.debug("CreateVnfIdentifier--post::> %s" % request.data) req_serializer = CreateVnfReqSerializer(data=request.data) if not req_serializer.is_valid(): - raise NFLCMException(req_serializer.errors) + 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} + "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) @@ -107,7 +114,7 @@ class DeleteVnfAndQueryVnf(APIView): ) @view_safe_call_with_log(logger=logger) def delete(self, request, instanceid): - logger.debug("DeleteVnfIdentifier--delete::> %s" % request.data) + logger.debug("DeleteVnfIdentifier--delete::> %s" % instanceid) DeleteVnf(request.data, instanceid).do_biz()