From: maopengzhang <zhang.maopeng1@zte.com.cn>
Date: Thu, 4 Jul 2019 08:30:34 +0000 (+0800)
Subject: refactor ns heal view code
X-Git-Tag: 1.3.4~53
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F90883%2F1;p=vfc%2Fnfvo%2Flcm.git

refactor ns heal view code

refactor ns heal view code

Change-Id: I342e21dd773f71f8c2ade33d64044a3f78da2486
Issue-ID: VFC-1431
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
---

diff --git a/lcm/ns/views/sol/heal_ns_view.py b/lcm/ns/views/sol/heal_ns_view.py
index 6dfef8d1..58418bd7 100644
--- a/lcm/ns/views/sol/heal_ns_view.py
+++ b/lcm/ns/views/sol/heal_ns_view.py
@@ -12,18 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+
+from .common import view_safe_call_with_log
 from drf_yasg.utils import swagger_auto_schema
-from rest_framework import status
-from rest_framework.response import Response
-from rest_framework.views import APIView
 from lcm.ns.biz.ns_heal import NSHealService
-from lcm.ns.serializers.sol.heal_serializers import HealNsReqSerializer
-from lcm.pub.exceptions import BadRequestException
-from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
 from lcm.ns.const import NS_OCC_BASE_URI
+from lcm.pub.enum import JOB_TYPE
+from lcm.pub.exceptions import BadRequestException
+from lcm.ns.serializers.sol.heal_serializers import HealNsReqSerializer
 from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
-from .common import view_safe_call_with_log
+from lcm.pub.utils.jobutil import JobUtil
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.views import APIView
 
 logger = logging.getLogger(__name__)
 
@@ -38,19 +39,17 @@ class HealNSView(APIView):
     )
     @view_safe_call_with_log(logger=logger)
     def post(self, request, ns_instance_id):
-        logger.debug("Enter HealNSView::post %s", request.data)
-        logger.debug("Enter HealNSView:: %s", ns_instance_id)
+        logger.debug("Enter HealNSView::post nsInstanceId:%s, request.data:%s" % (ns_instance_id, request.data))
         req_serializer = HealNsReqSerializer(data=request.data)
         if not req_serializer.is_valid():
-            logger.debug("request.data is not valid,error: %s" % req_serializer.errors)
+            logger.error("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()
+        job_id = JobUtil.create_job("NS", JOB_TYPE.HEAL_NS, ns_instance_id)
+        ns_heal_service = NSHealService(ns_instance_id, request.data, job_id)
+        ns_heal_service.start()
         response = Response(data={}, status=status.HTTP_202_ACCEPTED)
-        logger.debug("Location: %s" % nsHealService.occ_id)
-        response["Location"] = NS_OCC_BASE_URI % nsHealService.occ_id
+        logger.debug("Location: %s" % ns_heal_service.occ_id)
+        response["Location"] = NS_OCC_BASE_URI % ns_heal_service.occ_id
         logger.debug("Leave NSHealView")
         return response
diff --git a/lcm/pub/enum.py b/lcm/pub/enum.py
index 0a667a51..40fcdc37 100644
--- a/lcm/pub/enum.py
+++ b/lcm/pub/enum.py
@@ -30,9 +30,10 @@ JOB_TYPE = enum(
     HEAL_VNF="heal vnf",
     GRANT_VNF="grant vnf",
     MANUAL_SCALE_VNF="manual scale vnf",
-    TERMINATE_NS="terminate ns",
     TERMINATE_VNF="terminate vnf",
-    UPDATE_NS="update ns"
+    TERMINATE_NS="terminate ns",
+    UPDATE_NS="update ns",
+    HEAL_NS='heal ns'
 )
 JOB_PROGRESS = enum(
     ERROR=255,