diff options
Diffstat (limited to 'lcm/lcm/nf/views')
-rw-r--r-- | lcm/lcm/nf/views/common.py | 28 | ||||
-rw-r--r-- | lcm/lcm/nf/views/curd_vnf_views.py | 17 | ||||
-rw-r--r-- | lcm/lcm/nf/views/lcm_op_occs_view.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/views/subscriptions_view.py | 4 |
4 files changed, 28 insertions, 27 deletions
diff --git a/lcm/lcm/nf/views/common.py b/lcm/lcm/nf/views/common.py index e24a8bce..6bab28fb 100644 --- a/lcm/lcm/nf/views/common.py +++ b/lcm/lcm/nf/views/common.py @@ -51,43 +51,43 @@ def view_safe_call_with_log(logger): try: return func(*args, **kwargs) except NFLCMExceptionSeeOther as e: - logger.error(e.message) + logger.error(e.args[0]) resp = Response(status=status.HTTP_303_SEE_OTHER) - resp["Location"] = e.message + resp["Location"] = e.args[0] # resp["Location"] = "subscriptions/%s" % e.id return resp except NFLCMExceptionNotFound as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_404_NOT_FOUND ) except NFLCMExceptionBadRequest as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_400_BAD_REQUEST ) except NFLCMExceptionConflict as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_409_CONFLICT ) except NFLCMExceptionPreconditionFailed as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_412_PRECONDITION_FAILED ) except NFLCMException as e: - logger.error(e.message) + logger.error(e.args[0]) return make_error_resp( - detail=e.message, + detail=e.args[0], status=status.HTTP_500_INTERNAL_SERVER_ERROR ) except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) return make_error_resp( detail='Unexpected exception', @@ -143,7 +143,7 @@ def deal_indivdual_query(res_serializer, query_fun, *args): if not resp_serializer.is_valid(): raise NFLCMException(resp_serializer.errors) - resp = Response(data=resp_serializer.data, status=status.HTTP_200_OK) + resp = Response(data=res, status=status.HTTP_200_OK) if res_serializer == VnfInstanceSerializer: CACHE_ETAG = "%s" % uuid.uuid1() logger.debug("set CACHE_ETAG = %s", CACHE_ETAG) diff --git a/lcm/lcm/nf/views/curd_vnf_views.py b/lcm/lcm/nf/views/curd_vnf_views.py index 29ca82b8..e8c19d67 100644 --- a/lcm/lcm/nf/views/curd_vnf_views.py +++ b/lcm/lcm/nf/views/curd_vnf_views.py @@ -54,7 +54,7 @@ class CreateVnfAndQueryVnfs(APIView): 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(), @@ -71,15 +71,16 @@ class CreateVnfAndQueryVnfs(APIView): raise NFLCMException(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): diff --git a/lcm/lcm/nf/views/lcm_op_occs_view.py b/lcm/lcm/nf/views/lcm_op_occs_view.py index 5235ee08..ecb9b173 100644 --- a/lcm/lcm/nf/views/lcm_op_occs_view.py +++ b/lcm/lcm/nf/views/lcm_op_occs_view.py @@ -67,11 +67,11 @@ class QueryMultiVnfLcmOpOccs(APIView): logger.debug("QueryMultiVnfLcmOpOccs--get::> Remove default fields if exclude_default" + " is specified") # TODO(bharath): Add support for "fields", "exclude_fields" in query parameters - if 'exclude_default' in request.query_params.keys(): + if 'exclude_default' in list(request.query_params.keys()): for field in EXCLUDE_DEFAULT: - for lcm_op in vnf_lcm_op_occs_serializer.data: + for lcm_op in resp_data: del lcm_op[field] - return Response(data=vnf_lcm_op_occs_serializer.data, status=status.HTTP_200_OK) + return Response(data=resp_data, status=status.HTTP_200_OK) class QuerySingleVnfLcmOpOcc(APIView): diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py index c5496277..95b37725 100644 --- a/lcm/lcm/nf/views/subscriptions_view.py +++ b/lcm/lcm/nf/views/subscriptions_view.py @@ -62,7 +62,7 @@ class SubscriptionsView(APIView): if not lccn_subscription_request_serializer.is_valid():
raise NFLCMExceptionBadRequest(lccn_subscription_request_serializer.errors)
subscription = CreateSubscription(
- lccn_subscription_request_serializer.data).do_biz()
+ request.data).do_biz()
lccn_notifications_filter = {
"notificationTypes": ast.literal_eval(subscription.notification_types),
"operationTypes": ast.literal_eval(subscription.operation_types),
@@ -78,7 +78,7 @@ class SubscriptionsView(APIView): sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data)
if not sub_resp_serializer.is_valid():
raise NFLCMException(sub_resp_serializer.errors)
- return Response(data=sub_resp_serializer.data, status=status.HTTP_201_CREATED)
+ return Response(data=subscription_data, status=status.HTTP_201_CREATED)
@swagger_auto_schema(
responses={
|