Code Review
/
vfc
/
nfvo
/
lcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix swagger error
[vfc/nfvo/lcm.git]
/
lcm
/
ns
/
views
/
sol
/
heal_ns_view.py
diff --git
a/lcm/ns/views/sol/heal_ns_view.py
b/lcm/ns/views/sol/heal_ns_view.py
index
d98c972
..
6c844e1
100644
(file)
--- a/
lcm/ns/views/sol/heal_ns_view.py
+++ b/
lcm/ns/views/sol/heal_ns_view.py
@@
-1,4
+1,4
@@
-# Copyright 2016
-2017
ZTE Corporation.
+# Copyright 2016 ZTE Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-21,6
+21,7
@@
from lcm.ns.serializers.sol.heal_serializers import HealNsReqSerializer
from lcm.pub.exceptions import BadRequestException
from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE
from lcm.ns.const import NS_OCC_BASE_URI
from lcm.pub.exceptions import BadRequestException
from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE
from lcm.ns.const import NS_OCC_BASE_URI
+from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@
-29,11
+30,12
@@
class HealNSView(APIView):
@swagger_auto_schema(
request_body=HealNsReqSerializer(),
responses={
@swagger_auto_schema(
request_body=HealNsReqSerializer(),
responses={
- status.HTTP_202_ACCEPTED:
None
,
- status.HTTP_500_INTERNAL_SERVER_ERROR:
"Inner error"
+ status.HTTP_202_ACCEPTED:
"HTTP_202_ACCEPTED"
,
+ status.HTTP_500_INTERNAL_SERVER_ERROR:
ProblemDetailsSerializer()
}
)
def post(self, request, ns_instance_id):
}
)
def post(self, request, ns_instance_id):
+ job_id = JobUtil.create_job("VNF", JOB_TYPE.HEAL_VNF, ns_instance_id)
try:
logger.debug("Enter HealNSView::post %s", request.data)
logger.debug("Enter HealNSView:: %s", ns_instance_id)
try:
logger.debug("Enter HealNSView::post %s", request.data)
logger.debug("Enter HealNSView:: %s", ns_instance_id)
@@
-41,7
+43,6
@@
class HealNSView(APIView):
if not req_serializer.is_valid():
logger.debug("request.data is not valid,error: %s" % req_serializer.errors)
raise BadRequestException(req_serializer.errors)
if not req_serializer.is_valid():
logger.debug("request.data is not valid,error: %s" % req_serializer.errors)
raise BadRequestException(req_serializer.errors)
- job_id = JobUtil.create_job("VNF", JOB_TYPE.HEAL_VNF, ns_instance_id)
nsHealService = NSHealService(ns_instance_id, request.data, job_id)
nsHealService.start()
response = Response(data={}, status=status.HTTP_202_ACCEPTED)
nsHealService = NSHealService(ns_instance_id, request.data, job_id)
nsHealService.start()
response = Response(data={}, status=status.HTTP_202_ACCEPTED)
@@
-51,8
+52,11
@@
class HealNSView(APIView):
return response
except BadRequestException as e:
logger.error("Exception in HealNS: %s", e.message)
return response
except BadRequestException as e:
logger.error("Exception in HealNS: %s", e.message)
+ JobUtil.add_job_status(job_id, 255, 'NS heal failed: %s' % e.message)
data = {'status': status.HTTP_400_BAD_REQUEST, 'detail': e.message}
return Response(data=data, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
logger.error("Exception in HealNSView: %s", e.message)
data = {'status': status.HTTP_400_BAD_REQUEST, 'detail': e.message}
return Response(data=data, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
logger.error("Exception in HealNSView: %s", e.message)
- return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+ JobUtil.add_job_status(job_id, 255, 'NS heal failed: %s' % e.message)
+ data = {'status': status.HTTP_500_INTERNAL_SERVER_ERROR, 'detail': e.message}
+ return Response(data=data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)