From 3b4ff2329a2056e8d85353b037e64049fddbf260 Mon Sep 17 00:00:00 2001 From: biancunkang Date: Thu, 9 Aug 2018 11:47:30 +0800 Subject: CreateVnf and DeleteVnf Modify three files Change-Id: Ib9397d2336a39303e26910dc8948da233fa01cec Issue-ID: VFC-1015 Signed-off-by: biancunkang --- lcm/lcm/nf/views/curd_vnf_views.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lcm/lcm/nf/views/curd_vnf_views.py') diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py index 7419e69f..078053a8 100644 --- a/lcm/lcm/nf/views/curd_vnf_views.py +++ b/lcm/lcm/nf/views/curd_vnf_views.py @@ -23,7 +23,7 @@ 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 +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.pub.exceptions import NFLCMException @@ -57,9 +57,9 @@ class CreateVnfAndQueryVnfs(APIView): return Response(data={'error': 'Failed to get Vnfs'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) @swagger_auto_schema( - request_body=CreateVnfReqSerializer(), + request_body=VnfInstanceSerializer(), responses={ - status.HTTP_201_CREATED: CreateVnfRespSerializer(), + status.HTTP_201_CREATED: VnfInstanceSerializer(), status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error" } ) @@ -70,8 +70,11 @@ class CreateVnfAndQueryVnfs(APIView): if not req_serializer.is_valid(): raise NFLCMException(req_serializer.errors) - nf_inst_id = CreateVnf(req_serializer.data).do_biz().nfinstid - create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id}) + nf_inst = CreateVnf(req_serializer.data).do_biz() + create_vnf_resp_serializer = VnfInstanceSerializer(data={"id": nf_inst.nfinstid, + "vnfProvider": nf_inst.vendor, + "vnfdVersion": nf_inst.version, + "vnfPkgId": nf_inst.package_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) -- cgit 1.2.3-korg