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__)
if not vnf_instances_serializer.is_valid():
raise NFLCMException(vnf_instances_serializer.errors)
- return Response(data=vnf_instances_serializer.data, status=status.HTTP_200_OK)
+ return Response(data=resp_data, status=status.HTTP_200_OK)
@swagger_auto_schema(
request_body=CreateVnfReqSerializer(),
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()
- create_vnf_resp_serializer = VnfInstanceSerializer(
- data={"id": nf_inst.nfinstid,
- "vnfProvider": nf_inst.vendor,
- "vnfdVersion": nf_inst.version,
- "vnfPkgId": nf_inst.package_id,
- "instantiationState": nf_inst.status})
+ rsp_data = {"id": nf_inst.nfinstid,
+ "vnfProvider": nf_inst.vendor,
+ "vnfdVersion": nf_inst.version,
+ "vnfPkgId": nf_inst.package_id,
+ "instantiationState": nf_inst.status}
+ 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=create_vnf_resp_serializer.data, status=status.HTTP_201_CREATED)
+
+ return Response(data=rsp_data, status=status.HTTP_201_CREATED)
class DeleteVnfAndQueryVnf(APIView):
@view_safe_call_with_log(logger=logger)
def get(self, request, instanceid):
logger.debug("QuerySingleVnf--get::> %s" % request.data)
- resp_data = QueryVnf(request.data, instanceid).query_single_vnf()
-
- vnfs_instance_serializer = VnfInstanceSerializer(data=resp_data)
- if not vnfs_instance_serializer.is_valid():
- raise NFLCMException(vnfs_instance_serializer.errors)
- return Response(data=vnfs_instance_serializer.data, status=status.HTTP_200_OK)
+ return deal_indivdual_query(res_serializer=VnfInstanceSerializer,
+ query_fun=QueryVnf(
+ request.data,
+ instanceid).query_single_vnf)
@swagger_auto_schema(
responses={