resolve job issues

resolve job issues, and some python2-->python3 issues

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

diff --git a/lcm/jobs/const.py b/lcm/jobs/const.py
new file mode 100644 (file)
index 0000000..c4185ab
--- /dev/null
+++ b/lcm/jobs/const.py
@@ -0,0 +1,16 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from lcm.pub.config.config import MSB_BASE_URL
+
+JOB_INSTANCE_URI = MSB_BASE_URL + '/api/nslcm/v1/jobs/%s'

diff --git a/lcm/pub/enum.py b/lcm/jobs/enum.py
similarity index 80%
rename from lcm/pub/enum.py
rename to lcm/jobs/enum.py
index 40fcdc3..2eb096d 100644 (file)
--- a/lcm/pub/enum.py
+++ b/lcm/jobs/enum.py
@@ -26,14 +26,17 @@ JOB_MODEL_STATUS = enum(
     TIMEOUT='timeout'
 )
 JOB_TYPE = enum(
-    CREATE_VNF="create vnf",
-    HEAL_VNF="heal vnf",
-    GRANT_VNF="grant vnf",
-    MANUAL_SCALE_VNF="manual scale vnf",
-    TERMINATE_VNF="terminate vnf",
-    TERMINATE_NS="terminate ns",
-    UPDATE_NS="update ns",
-    HEAL_NS='heal ns'
+    NS="NS",
+    VNF="VNF"
+)
+JOB_ACTION = enum(
+    CREATE="CREATE",
+    INSTANTIATE="INSTANTIATE",
+    UPDATE="UPDATE",
+    HEAL="HEAL",
+    GRANT="GRANT",
+    MANUAL_SCALE="MANUAL SCALE",
+    TERMINATE="TERMINATE"
 )
 JOB_PROGRESS = enum(
     ERROR=255,

diff --git a/lcm/jobs/job_get.py b/lcm/jobs/job_get.py
index d3ebc2f..57fb016 100644 (file)
--- a/lcm/jobs/job_get.py
+++ b/lcm/jobs/job_get.py
@@ -27,7 +27,7 @@ class GetJobInfoService(object):
         self.response_id = response_id if response_id else 0
 
     def do_biz(self):
-        logger.debug("[getjob]job_id=%s, response_id=%s", self.job_id, self.response_id)
+        logger.debug("GetJobInfoService, job_id=%s, response_id=%s", self.job_id, self.response_id)
         jobs = JobUtil.query_job_status(self.job_id, self.response_id)
         if not jobs:
             job_query_resp = JobQueryResp(self.job_id)

diff --git a/lcm/jobs/serializers.py b/lcm/jobs/serializers.py
index 55500fb..e27f9cd 100644 (file)
--- a/lcm/jobs/serializers.py
+++ b/lcm/jobs/serializers.py
@@ -73,7 +73,7 @@ class JobUpdReqSerializer(serializers.Serializer):
         help_text="Progress of job",
         required=True)
     desc = serializers.CharField(
-        help_text="Desc of job",
+        help_text="Description of job",
         required=False)
     errcode = serializers.CharField(
         help_text="Error code of job",
@@ -82,8 +82,8 @@ class JobUpdReqSerializer(serializers.Serializer):
 
 class JobUpdRespSerializer(serializers.Serializer):
     result = serializers.CharField(
-        help_text="Result of job update",
+        help_text="Result of the job",
         required=True)
     msg = serializers.CharField(
-        help_text="Detail of job update",
+        help_text="Detail of the job",
         required=False)

diff --git a/lcm/jobs/tests/tests.py b/lcm/jobs/tests/tests.py
index a5e376b..3858701 100644 (file)
--- a/lcm/jobs/tests/tests.py
+++ b/lcm/jobs/tests/tests.py
@@ -11,17 +11,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from django.test import TestCase
-from rest_framework.test import APIClient
-from rest_framework import status
 
-from lcm.pub.database.models import JobModel, JobStatusModel
+from django.test import TestCase
 from lcm.jobs.tests import UPDATE_JOB_DICT
+from lcm.pub.database.models import JobModel, JobStatusModel
+from rest_framework import status
+from rest_framework.test import APIClient
 
 
 class JobsViewTest(TestCase):
     def setUp(self):
         self.job_id = 'test_job_id'
+        self.job_type = 'NS'
+        self.job_type = ''
         self.client = APIClient()
         JobModel.objects.all().delete()
         JobStatusModel.objects.all().delete()

diff --git a/lcm/jobs/views.py b/lcm/jobs/views.py
index 3079c16..2518b3c 100644 (file)
--- a/lcm/jobs/views.py
+++ b/lcm/jobs/views.py
@@ -20,7 +20,7 @@ from rest_framework.views import APIView
 from rest_framework import status
 from drf_yasg.utils import swagger_auto_schema
 
-from lcm.pub.enum import JOB_ERROR_CODE
+from lcm.jobs.enum import JOB_ERROR_CODE
 from lcm.jobs.job_get import GetJobInfoService
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.jobs.api_model import JobUpdReq, JobUpdResp
@@ -41,7 +41,7 @@ class JobView(APIView):
     input_response_id = openapi.Parameter(
         'responseId',
         openapi.IN_QUERY,
-        description="response id",
+        description="job response id",
         type=openapi.TYPE_STRING)
 
     @swagger_auto_schema(
@@ -49,17 +49,19 @@ class JobView(APIView):
         manual_parameters=[input_job_id, input_response_id],
         responses={
             status.HTTP_200_OK: JobQueryRespSerializer(),
-            status.HTTP_500_INTERNAL_SERVER_ERROR: "Inner error"
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "HTTP_500_INTERNAL_SERVER_ERROR"
         }
     )
     def get(self, request, job_id):
         try:
+            logger.debug("Enter JobView::get, job_id: %s, request= %s ", job_id, request.data)
             response_id = int(request.GET.get('responseId', 0))
             ret = GetJobInfoService(job_id, response_id).do_biz()
             resp_serializer = JobQueryRespSerializer(data=ret)
             if not resp_serializer.is_valid():
                 raise NSLCMException(resp_serializer.errors)
-            return Response(data=ret, status=status.HTTP_200_OK)
+            logger.debug("Leave JobView::get, response=%s", resp_serializer.data)
+            return Response(data=resp_serializer.data, status=status.HTTP_200_OK)
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response(data={'error': e.args[0]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -74,15 +76,14 @@ class JobView(APIView):
     )
     def post(self, request, job_id):
         try:
-            logger.debug("Enter JobView:post, %s, %s ", job_id, request.data)
-
+            logger.debug("Enter JobView:post, job_id=%s, request=%s", job_id, request.data)
             req_serializer = JobUpdReqSerializer(data=request.data)
             if not req_serializer.is_valid():
                 raise BadRequestException(req_serializer.errors)
 
             jobs = JobUtil.query_job_status(job_id)
             if not jobs:
-                raise NSLCMException("Job(%s) does not exist." % job_id)
+                raise BadRequestException("Job(%s) does not exist." % job_id)
 
             if jobs[-1].errcode != JOB_ERROR_CODE.ERROR:
                 job_up_req = JobUpdReq(**request.data)
@@ -92,8 +93,9 @@ class JobView(APIView):
                 JobUtil.add_job_status(job_id, job_up_req.progress, desc, error_code=errcode)
             job_update_resp = JobUpdResp('ok')
             resp_serializer = JobUpdRespSerializer(job_update_resp)
+            logger.debug("Leave JobView::post, response=%s", resp_serializer.data)
             return Response(data=resp_serializer.data, status=status.HTTP_202_ACCEPTED)
-        except NSLCMException as e:
+        except BadRequestException as e:
             job_update_resp = JobUpdResp('error', e.args[0])
             resp_serializer = JobUpdRespSerializer(job_update_resp)
             return Response(data=resp_serializer.data, status=status.HTTP_400_BAD_REQUEST)

diff --git a/lcm/ns/biz/ns_heal.py b/lcm/ns/biz/ns_heal.py
index 8ca033f..316df7a 100644 (file)
--- a/lcm/ns/biz/ns_heal.py
+++ b/lcm/ns/biz/ns_heal.py
@@ -22,7 +22,7 @@ from lcm.ns.enum import NS_INST_STATUS
 from lcm.pub.database.models import JobModel, NSInstModel, NfInstModel, VNFCInstModel, VmInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_PROGRESS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.biz.heal_vnfs import NFHealService
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc

diff --git a/lcm/ns/biz/ns_instantiate_flow.py b/lcm/ns/biz/ns_instantiate_flow.py
index 04532c2..c840a75 100644 (file)
--- a/lcm/ns/biz/ns_instantiate_flow.py
+++ b/lcm/ns/biz/ns_instantiate_flow.py
@@ -20,7 +20,7 @@ from threading import Thread
 from lcm.pub.utils.syscomm import fun_name
 from lcm.pub.utils.values import ignore_case_get
 from lcm.pub.utils import restcall
-from lcm.pub.enum import JOB_PROGRESS, JOB_ERROR_CODE
+from lcm.jobs.enum import JOB_PROGRESS, JOB_ERROR_CODE
 from lcm.pub.exceptions import NSLCMException
 from lcm.workflows.graphflow.flow.flow import GraphFlow
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc

diff --git a/lcm/ns/biz/ns_manual_scale.py b/lcm/ns/biz/ns_manual_scale.py
index f40cb0a..ecf7eed 100644 (file)
--- a/lcm/ns/biz/ns_manual_scale.py
+++ b/lcm/ns/biz/ns_manual_scale.py
@@ -22,7 +22,7 @@ from lcm.ns.enum import NS_INST_STATUS
 from lcm.pub.database.models import JobModel, NSInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_PROGRESS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.biz.scale_vnfs import NFManualScaleService
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc

diff --git a/lcm/ns/biz/ns_terminate.py b/lcm/ns/biz/ns_terminate.py
index 810f60a..59c99da 100644 (file)
--- a/lcm/ns/biz/ns_terminate.py
+++ b/lcm/ns/biz/ns_terminate.py
@@ -26,7 +26,7 @@ from lcm.pub.utils import restcall
 from lcm.ns.enum import OWNER_TYPE
 from lcm.pub.database.models import PNFInstModel
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc
-from lcm.pub.enum import JOB_PROGRESS
+from lcm.jobs.enum import JOB_PROGRESS
 
 logger = logging.getLogger(__name__)
 

diff --git a/lcm/ns/biz/ns_update.py b/lcm/ns/biz/ns_update.py
index c61071f..95edd3b 100644 (file)
--- a/lcm/ns/biz/ns_update.py
+++ b/lcm/ns/biz/ns_update.py
@@ -22,7 +22,7 @@ from lcm.pub.database.models import JobModel, NSInstModel
 from lcm.ns_vnfs.biz.update_vnfs import NFOperateService
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_PROGRESS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc
 

diff --git a/lcm/ns/tests/test_ns_heal.py b/lcm/ns/tests/test_ns_heal.py
index 88b7ac7..c6bf8a3 100644 (file)
--- a/lcm/ns/tests/test_ns_heal.py
+++ b/lcm/ns/tests/test_ns_heal.py
@@ -21,7 +21,7 @@ from lcm.ns.enum import NS_INST_STATUS
 from lcm.pub.database.models import NSInstModel, NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns_vnfs.biz.heal_vnfs import NFHealService
 from lcm.ns.tests import HEAL_NS_DICT, HEAL_VNF_DICT, VNFD_MODEL_DICT
 
@@ -31,7 +31,7 @@ class TestHealNsViews(TestCase):
         self.ns_inst_id = '1'
         self.nf_inst_id = '1'
         self.nf_uuid = '1-1-1'
-        self.job_id = JobUtil.create_job("NS", JOB_TYPE.HEAL_VNF, self.ns_inst_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.HEAL, self.ns_inst_id)
         self.client = APIClient()
         NSInstModel.objects.filter().delete()
         NfInstModel.objects.filter().delete()

diff --git a/lcm/ns/tests/test_ns_manual_scale.py b/lcm/ns/tests/test_ns_manual_scale.py
index 5c8202b..4c31611 100644 (file)
--- a/lcm/ns/tests/test_ns_manual_scale.py
+++ b/lcm/ns/tests/test_ns_manual_scale.py
@@ -27,7 +27,7 @@ from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi import catalog
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_ACTION
 from lcm.ns.tests import SCALING_MAP_DICT, VNFD_MODEL_DICT, SCALE_NS_DICT
 
 
@@ -36,7 +36,7 @@ class TestNsManualScale(TestCase):
     def setUp(self):
         self.scaling_map_json = SCALING_MAP_DICT
         self.ns_inst_id = str(uuid.uuid4())
-        self.job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, self.ns_inst_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, self.ns_inst_id)
         self.client = APIClient()
         self.package_id = "7"
         NSInstModel(
@@ -51,8 +51,7 @@ class TestNsManualScale(TestCase):
 
     def insert_new_ns(self):
         ns_inst_id = str(uuid.uuid4())
-        job_id = JobUtil.create_job(
-            "NS", JOB_TYPE.MANUAL_SCALE_VNF, self.ns_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, self.ns_inst_id)
         package_id = "23"
         NSInstModel(
             id=ns_inst_id,
@@ -102,7 +101,7 @@ class TestNsManualScale(TestCase):
         scale_ns_json = SCALE_NS_DICT.copy()
         scale_ns_json["scaleNsData"][0]["scaleNsByStepsData"][0]["aspectId"] = "sss_zte"
         ns_inst_id, job_id = self.insert_new_ns()
-        job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, ns_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, ns_inst_id)
         NSManualScaleService(ns_inst_id, scale_ns_json, job_id).run()
         jobs = JobModel.objects.filter(jobid=job_id)
         self.assertEqual(255, jobs[0].progress)
@@ -115,7 +114,7 @@ class TestNsManualScale(TestCase):
         mock_get_scalingmap_json_package.return_value = self.scaling_map_json
         mock_do_vnfs_scale.return_value = JOB_MODEL_STATUS.FINISHED
         ns_inst_id, job_id = self.insert_new_ns()
-        job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, ns_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, ns_inst_id)
         self.insert_new_nf()
         NSManualScaleService(ns_inst_id, scale_ns_json, job_id).run()
         jobs = JobModel.objects.filter(jobid=job_id)

diff --git a/lcm/ns/tests/test_sol_ns_heal_api.py b/lcm/ns/tests/test_sol_ns_heal_api.py
index 04a4bcc..4a74efc 100644 (file)
--- a/lcm/ns/tests/test_sol_ns_heal_api.py
+++ b/lcm/ns/tests/test_sol_ns_heal_api.py
@@ -24,7 +24,7 @@ from lcm.ns.biz.ns_heal import NSHealService
 from lcm.pub.database.models import NSInstModel, NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns.tests import VNFD_MODEL_DICT, HEAL_NS_DICT, HEAL_VNF_DICT
 
 
@@ -34,7 +34,7 @@ class TestHealNsApi(TestCase):
         self.ns_inst_id = str(uuid.uuid4())
         self.nf_inst_id = '1'
         self.nf_uuid = '1-1-1'
-        self.job_id = JobUtil.create_job("NS", JOB_TYPE.HEAL_VNF, self.ns_inst_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.HEAL, self.ns_inst_id)
         self.client = Client()
         model = json.dumps(VNFD_MODEL_DICT)
         NSInstModel.objects.filter().delete()

diff --git a/lcm/ns/tests/test_sol_ns_scale_api.py b/lcm/ns/tests/test_sol_ns_scale_api.py
index d995958..968c21a 100644 (file)
--- a/lcm/ns/tests/test_sol_ns_scale_api.py
+++ b/lcm/ns/tests/test_sol_ns_scale_api.py
@@ -22,7 +22,7 @@ from lcm.ns.biz.ns_manual_scale import NSManualScaleService
 from lcm.pub.database.models import NSInstModel, JobModel, NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns.tests import VNFD_MODEL_DICT, SCALE_NS_DICT
 
 
@@ -30,7 +30,7 @@ class TestScaleNsApi(TestCase):
     def setUp(self):
         self.url = "/api/nslcm/v1/ns_instances/%s/scale"
         self.ns_inst_id = str(uuid.uuid4())
-        self.job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, self.ns_inst_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, self.ns_inst_id)
         self.package_id = "7"
         self.client = APIClient()
         NSInstModel(
@@ -45,7 +45,7 @@ class TestScaleNsApi(TestCase):
 
     def insert_new_ns(self):
         ns_inst_id = str(uuid.uuid4())
-        job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, self.ns_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, self.ns_inst_id)
         package_id = "23"
         NSInstModel(
             id=ns_inst_id,

diff --git a/lcm/ns/tests/tests_ns_terminate.py b/lcm/ns/tests/tests_ns_terminate.py
index feaa4d5..d7ce54a 100644 (file)
--- a/lcm/ns/tests/tests_ns_terminate.py
+++ b/lcm/ns/tests/tests_ns_terminate.py
@@ -21,7 +21,7 @@ from rest_framework import status
 from lcm.ns.biz.ns_terminate import TerminateNsService
 from lcm.pub.database.models import NfInstModel, NSInstModel
 from lcm.pub.utils import restcall
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_ACTION
 from lcm.pub.utils.jobutil import JobUtil
 
 
@@ -50,7 +50,7 @@ class TestTerminateNsViews(TestCase):
         NfInstModel.objects.all().delete()
 
     @mock.patch.object(TerminateNsService, 'run')
-    def test_terminate_vnf_url(self, mock_run):
+    def test_terminate_ns_api(self, mock_run):
         mock_run.re.return_value = "1"
         req_data = {
             "terminationType": "forceful",
@@ -62,8 +62,8 @@ class TestTerminateNsViews(TestCase):
         self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)
 
     @mock.patch.object(restcall, 'call_req')
-    def test_terminate_vnf(self, mock_call_req):
-        job_id = JobUtil.create_job("VNF", JOB_TYPE.TERMINATE_VNF, self.nf_inst_id)
+    def test_terminate_ns_service(self, mock_call_req):
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.TERMINATE, self.ns_inst_id)
 
         mock_vals = {
             "/api/nslcm/v1/ns/ns_vls/1":
@@ -93,7 +93,7 @@ class TestTerminateNsViews(TestCase):
         req_data = {
             "terminationType": "FORCEFUL",
             "gracefulTerminationTimeout": "600"}
-        TerminateNsService(self.nf_inst_id, job_id, req_data).run()
+        TerminateNsService(self.ns_inst_id, job_id, req_data).run()
         nsinst = NSInstModel.objects.get(id=self.ns_inst_id)
         if nsinst:
             self.assertTrue(1, 0)

diff --git a/lcm/ns/views/deprecated/heal_ns_view.py b/lcm/ns/views/deprecated/heal_ns_view.py
index 3b7f25c..d046ae3 100644 (file)
--- a/lcm/ns/views/deprecated/heal_ns_view.py
+++ b/lcm/ns/views/deprecated/heal_ns_view.py
@@ -23,7 +23,7 @@ from lcm.ns.serializers.deprecated.ns_serializers import _HealNsReqSerializer
 from lcm.ns.serializers.deprecated.ns_serializers import _NsOperateJobSerializer
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 
 logger = logging.getLogger(__name__)
 
@@ -44,7 +44,7 @@ class NSHealView(APIView):
             if not req_serializer.is_valid():
                 raise NSLCMException(req_serializer.errors)
 
-            job_id = JobUtil.create_job("VNF", JOB_TYPE.HEAL_VNF, ns_instance_id)
+            job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.HEAL, ns_instance_id)
             NSHealService(ns_instance_id, request.data, job_id).start()
 
             resp_serializer = _NsOperateJobSerializer(data={'jobId': job_id})

diff --git a/lcm/ns/views/deprecated/scale_ns_views.py b/lcm/ns/views/deprecated/scale_ns_views.py
index c05a75d..ed51e86 100644 (file)
--- a/lcm/ns/views/deprecated/scale_ns_views.py
+++ b/lcm/ns/views/deprecated/scale_ns_views.py
@@ -23,7 +23,7 @@ from lcm.ns.serializers.deprecated.ns_serializers import _NsOperateJobSerializer
 from lcm.ns.serializers.deprecated.ns_serializers import _ManualScaleNsReqSerializer
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 
 logger = logging.getLogger(__name__)
 
@@ -38,7 +38,7 @@ class NSManualScaleView(APIView):
     )
     def post(self, request, ns_instance_id):
         logger.debug("Enter NSManualScaleView::post %s, %s", request.data, ns_instance_id)
-        job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, ns_instance_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, ns_instance_id)
         try:
             req_serializer = _ManualScaleNsReqSerializer(data=request.data)
             if not req_serializer.is_valid():

diff --git a/lcm/ns/views/deprecated/term_ns_view.py b/lcm/ns/views/deprecated/term_ns_view.py
index d6a94b2..652b8db 100644 (file)
--- a/lcm/ns/views/deprecated/term_ns_view.py
+++ b/lcm/ns/views/deprecated/term_ns_view.py
@@ -22,7 +22,7 @@ from lcm.ns.biz.ns_terminate import TerminateNsService
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.exceptions import BadRequestException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns.serializers.deprecated.ns_serializers import _TerminateNsReqSerializer
 from lcm.ns.serializers.deprecated.ns_serializers import _NsOperateJobSerializer
 
@@ -45,7 +45,7 @@ class NSTerminateView(APIView):
             if not req_serializer.is_valid():
                 raise BadRequestException(req_serializer.errors)
 
-            job_id = JobUtil.create_job("NS", JOB_TYPE.TERMINATE_NS, ns_instance_id)
+            job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.TERMINATE, ns_instance_id)
             TerminateNsService(ns_instance_id, job_id, request.data).start()
 
             resp_serializer = _NsOperateJobSerializer(data={'jobId': job_id})
@@ -54,7 +54,7 @@ class NSTerminateView(APIView):
             logger.debug("Leave TerminateNSView::post ret=%s", resp_serializer.data)
             return Response(data=resp_serializer.data, status=status.HTTP_202_ACCEPTED)
         except BadRequestException as e:
-            return Response(data={'error': e.message}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(data={'error': e.args[0]}, status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
-            logger.error("Exception in CreateNS: %s", e.message)
-            return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            logger.error("Exception in CreateNS: %s", e.args[0])
+            return Response(data={'error': e.args[0]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

diff --git a/lcm/ns/views/deprecated/update_ns_view.py b/lcm/ns/views/deprecated/update_ns_view.py
index 0468069..47ab0c4 100644 (file)
--- a/lcm/ns/views/deprecated/update_ns_view.py
+++ b/lcm/ns/views/deprecated/update_ns_view.py
@@ -25,7 +25,7 @@ from lcm.ns.serializers.sol.update_serializers import UpdateNsReqSerializer
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.exceptions import BadRequestException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +46,7 @@ class NSUpdateView(APIView):
             if not req_serializer.is_valid():
                 raise BadRequestException(req_serializer.errors)
 
-            job_id = JobUtil.create_job("NS", JOB_TYPE.UPDATE_NS, ns_instance_id)
+            job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.UPDATE, ns_instance_id)
             NSUpdateService(ns_instance_id, request.data, job_id).start()
 
             resp_serializer = _NsOperateJobSerializer(data={'jobId': job_id})
@@ -56,7 +56,7 @@ class NSUpdateView(APIView):
             logger.debug("Leave UpdateNSView::post ret=%s", resp_serializer.data)
             return Response(data=resp_serializer.data, status=status.HTTP_202_ACCEPTED)
         except BadRequestException as e:
-            return Response(data={'error': e.message}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(data={'error': e.args[0]}, status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
-            logger.error("Exception in UpdateNSView: %s", e.message)
-            return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            logger.error("Exception in UpdateNSView: %s", e.args[0])
+            return Response(data={'error': e.args[0]}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

diff --git a/lcm/ns/views/sol/heal_ns_view.py b/lcm/ns/views/sol/heal_ns_view.py
index 58418bd..721fc5f 100644 (file)
--- a/lcm/ns/views/sol/heal_ns_view.py
+++ b/lcm/ns/views/sol/heal_ns_view.py
@@ -17,7 +17,7 @@ from .common import view_safe_call_with_log
 from drf_yasg.utils import swagger_auto_schema
 from lcm.ns.biz.ns_heal import NSHealService
 from lcm.ns.const import NS_OCC_BASE_URI
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.pub.exceptions import BadRequestException
 from lcm.ns.serializers.sol.heal_serializers import HealNsReqSerializer
 from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
@@ -45,7 +45,7 @@ class HealNSView(APIView):
             logger.error("request.data is not valid,error: %s" % req_serializer.errors)
             raise BadRequestException(req_serializer.errors)
 
-        job_id = JobUtil.create_job("NS", JOB_TYPE.HEAL_NS, ns_instance_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.HEAL, 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)

diff --git a/lcm/ns/views/sol/scale_ns_views.py b/lcm/ns/views/sol/scale_ns_views.py
index af23381..9968314 100644 (file)
--- a/lcm/ns/views/sol/scale_ns_views.py
+++ b/lcm/ns/views/sol/scale_ns_views.py
@@ -20,7 +20,7 @@ from rest_framework.views import APIView
 from lcm.ns.biz.ns_manual_scale import NSManualScaleService
 from lcm.ns.serializers.sol.scale_ns_serializers import ScaleNsRequestSerializer
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns.const import NS_OCC_BASE_URI
 from lcm.pub.exceptions import BadRequestException
 from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
@@ -45,7 +45,7 @@ class ScaleNSView(APIView):
         if not req_serializer.is_valid():
             raise BadRequestException(req_serializer.errors)
 
-        job_id = JobUtil.create_job("NS", JOB_TYPE.MANUAL_SCALE_VNF, ns_instance_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.MANUAL_SCALE, ns_instance_id)
 
         nsManualScaleService = NSManualScaleService(ns_instance_id, request.data, job_id)
         nsManualScaleService.start()

diff --git a/lcm/ns/views/sol/terminate_ns_view.py b/lcm/ns/views/sol/terminate_ns_view.py
index 97d6044..51e087b 100644 (file)
--- a/lcm/ns/views/sol/terminate_ns_view.py
+++ b/lcm/ns/views/sol/terminate_ns_view.py
@@ -20,7 +20,7 @@ from rest_framework.views import APIView
 
 from lcm.ns.biz.ns_terminate import TerminateNsService
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns.serializers.sol.terminate_ns_serializers import TerminateNsReqSerializer
 from lcm.pub.exceptions import BadRequestException
@@ -42,20 +42,20 @@ class TerminateNsView(APIView):
     )
     @view_safe_call_with_log(logger=logger)
     def post(self, request, ns_instance_id):
-        job_id = JobUtil.create_job("NS", JOB_TYPE.TERMINATE_NS, ns_instance_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.TERMINATE, ns_instance_id)
 
         logger.debug("Enter TerminateNSView::post %s", request.data)
         req_serializer = TerminateNsReqSerializer(data=request.data)
         if not req_serializer.is_valid():
             logger.debug("request.data is not valid,error: %s" % req_serializer.errors)
             raise BadRequestException(req_serializer.errors)
-        terminationTime = ignore_case_get(request.data, 'terminationTime')
-        logger.debug("terminationTime is %s" % terminationTime)
+        termination_time = ignore_case_get(request.data, 'terminationTime')
+        logger.debug("terminationTime is %s" % termination_time)
         # todo terminationTime
-        terminateNsService = TerminateNsService(ns_instance_id, job_id, request.data)
-        terminateNsService.start()
-        logger.debug("Location: %s" % terminateNsService.occ_id)
+        terminate_ns_service = TerminateNsService(ns_instance_id, job_id, request.data)
+        terminate_ns_service.start()
+        logger.debug("Location: %s" % terminate_ns_service.occ_id)
         response = Response(data={}, status=status.HTTP_202_ACCEPTED)
-        response["Location"] = NS_OCC_BASE_URI % terminateNsService.occ_id
+        response["Location"] = NS_OCC_BASE_URI % terminate_ns_service.occ_id
         logger.debug("Leave TerminateNSView")
         return response

diff --git a/lcm/ns/views/sol/update_ns_view.py b/lcm/ns/views/sol/update_ns_view.py
index d160375..db6d607 100644 (file)
--- a/lcm/ns/views/sol/update_ns_view.py
+++ b/lcm/ns/views/sol/update_ns_view.py
@@ -23,7 +23,7 @@ from lcm.ns.biz.ns_update import NSUpdateService
 from lcm.ns.serializers.sol.update_serializers import UpdateNsReqSerializer
 from lcm.pub.exceptions import BadRequestException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.ns.const import NS_OCC_BASE_URI
 from lcm.ns.serializers.sol.pub_serializers import ProblemDetailsSerializer
 from .common import view_safe_call_with_log
@@ -41,17 +41,17 @@ class UpdateNSView(APIView):
     )
     @view_safe_call_with_log(logger=logger)
     def post(self, request, ns_instance_id):
-        job_id = JobUtil.create_job("NS", JOB_TYPE.UPDATE_NS, ns_instance_id)
+        job_id = JobUtil.create_job(JOB_TYPE.NS, JOB_ACTION.UPDATE, ns_instance_id)
 
         logger.debug("Enter UpdateNSView::post %s, %s", request.data, ns_instance_id)
         req_serializer = UpdateNsReqSerializer(data=request.data)
         if not req_serializer.is_valid():
             logger.debug("request.data is not valid,error: %s" % req_serializer.errors)
             raise BadRequestException(req_serializer.errors)
-        nsUpdateService = NSUpdateService(ns_instance_id, request.data, job_id)
-        nsUpdateService.start()
+        ns_update_service = NSUpdateService(ns_instance_id, request.data, job_id)
+        ns_update_service.start()
         response = Response(data={}, status=status.HTTP_202_ACCEPTED)
-        logger.debug("Location: %s" % nsUpdateService.occ_id)
-        response["Location"] = NS_OCC_BASE_URI % nsUpdateService.occ_id
+        logger.debug("Location: %s" % ns_update_service.occ_id)
+        response["Location"] = NS_OCC_BASE_URI % ns_update_service.occ_id
         logger.debug("Leave UpdateNSView")
         return response

diff --git a/lcm/ns_vnfs/biz/create_vnfs.py b/lcm/ns_vnfs/biz/create_vnfs.py
index 3e6c511..4d7457b 100644 (file)
--- a/lcm/ns_vnfs/biz/create_vnfs.py
+++ b/lcm/ns_vnfs/biz/create_vnfs.py
@@ -22,12 +22,12 @@ from lcm.ns.enum import OWNER_TYPE
 from lcm.ns_vnfs.const import NFVO_VNF_INST_TIMEOUT_SECOND
 from lcm.ns_vnfs.biz.subscribe import SubscriptionCreation
 from lcm.ns_vnfs.biz.wait_job import wait_job_finish
-from lcm.ns_vnfs.enum import VNF_STATUS, INST_TYPE, INST_TYPE_NAME
+from lcm.ns_vnfs.enum import VNF_STATUS, INST_TYPE
 from lcm.pub.config.config import REPORT_TO_AAI
 from lcm.pub.config.config import REG_TO_MSB_REG_PARAM, OOF_BASE_URL, OOF_PASSWD, OOF_USER
 from lcm.pub.config.config import CUST_NAME, CUST_LAT, CUST_LONG
 from lcm.pub.database.models import NfInstModel, NSInstModel, VmInstModel, VNFFGInstModel, VLInstModel, OOFDataModel
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS, JOB_ERROR_CODE
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_ACTION, JOB_PROGRESS, JOB_ERROR_CODE, JOB_TYPE
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.aai import create_vnf_aai
 from lcm.pub.msapi.extsys import get_vnfm_by_id
@@ -52,7 +52,7 @@ def prepare_create_params():
         create_time=now_time(),
         lastuptime=now_time()
     ).save()
-    job_id = JobUtil.create_job(INST_TYPE_NAME.VNF, JOB_TYPE.CREATE_VNF, nf_inst_id)
+    job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.CREATE, nf_inst_id)
     JobUtil.add_job_status(job_id, JOB_PROGRESS.STARTED, 'create vnf record in database.', JOB_ERROR_CODE.NO_ERROR)
     return nf_inst_id, job_id
 

diff --git a/lcm/ns_vnfs/biz/heal_vnfs.py b/lcm/ns_vnfs/biz/heal_vnfs.py
index 9f730d7..69041f7 100644 (file)
--- a/lcm/ns_vnfs/biz/heal_vnfs.py
+++ b/lcm/ns_vnfs/biz/heal_vnfs.py
@@ -24,7 +24,7 @@ from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.vnfmdriver import send_nf_heal_request
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.enum import VNF_STATUS
 from lcm.ns_vnfs.biz.wait_job import wait_job_finish
@@ -38,7 +38,7 @@ class NFHealService(threading.Thread):
         super(NFHealService, self).__init__()
         self.vnf_instance_id = vnf_instance_id
         self.data = data
-        self.job_id = JobUtil.create_job("NF", JOB_TYPE.HEAL_VNF, vnf_instance_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.HEAL, vnf_instance_id)
         self.nf_model = {}
         self.nf_additional_params = {}
         self.nf_heal_params = {}

diff --git a/lcm/ns_vnfs/biz/scale_vnfs.py b/lcm/ns_vnfs/biz/scale_vnfs.py
index f46852b..cf4369e 100644 (file)
--- a/lcm/ns_vnfs/biz/scale_vnfs.py
+++ b/lcm/ns_vnfs/biz/scale_vnfs.py
@@ -20,7 +20,7 @@ from lcm.pub.database.models import NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.vnfmdriver import send_nf_scaling_request
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.enum import VNF_STATUS
 from lcm.ns_vnfs.biz.wait_job import wait_job_finish
@@ -33,8 +33,7 @@ class NFManualScaleService(threading.Thread):
         super(NFManualScaleService, self).__init__()
         self.vnf_instance_id = vnf_instance_id
         self.data = data
-        self.job_id = JobUtil.create_job(
-            "NF", JOB_TYPE.MANUAL_SCALE_VNF, vnf_instance_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.MANUAL_SCALE, vnf_instance_id)
         self.nf_scale_params = []
         self.m_nf_inst_id = ''
         self.vnfm_inst_id = ''

diff --git a/lcm/ns_vnfs/biz/terminate_nfs.py b/lcm/ns_vnfs/biz/terminate_nfs.py
index b435e67..6cbabc1 100644 (file)
--- a/lcm/ns_vnfs/biz/terminate_nfs.py
+++ b/lcm/ns_vnfs/biz/terminate_nfs.py
@@ -25,7 +25,7 @@ from lcm.pub.msapi.aai import query_vnf_aai, delete_vnf_aai, query_vserver_aai,
 from lcm.pub.msapi.extsys import split_vim_to_owner_region, get_vim_by_id
 from lcm.pub.msapi.vnfmdriver import send_nf_terminate_request
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS
+from lcm.jobs.enum import JOB_MODEL_STATUS
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.const import NFVO_VNF_INST_TIMEOUT_SECOND
 from lcm.ns_vnfs.enum import VNF_STATUS, INST_TYPE

diff --git a/lcm/ns_vnfs/biz/update_vnfs.py b/lcm/ns_vnfs/biz/update_vnfs.py
index 82bb92e..ad587fd 100644 (file)
--- a/lcm/ns_vnfs/biz/update_vnfs.py
+++ b/lcm/ns_vnfs/biz/update_vnfs.py
@@ -21,7 +21,7 @@ from lcm.pub.database.models import NfInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.vnfmdriver import send_nf_operate_request
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_PROGRESS, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.enum import VNF_STATUS
 from lcm.ns_vnfs.biz.wait_job import wait_job_finish
@@ -34,7 +34,7 @@ class NFOperateService(threading.Thread):
         super(NFOperateService, self).__init__()
         self.vnf_instance_id = vnf_instance_id
         self.data = data
-        self.job_id = JobUtil.create_job("NF", JOB_TYPE.HEAL_VNF, vnf_instance_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.HEAL, vnf_instance_id)
 
         self.nf_model = {}
         self.nf_additional_params = {}

diff --git a/lcm/ns_vnfs/biz/verify_vnfs.py b/lcm/ns_vnfs/biz/verify_vnfs.py
index a66de7e..55f80e1 100644 (file)
--- a/lcm/ns_vnfs/biz/verify_vnfs.py
+++ b/lcm/ns_vnfs/biz/verify_vnfs.py
@@ -20,7 +20,7 @@ import time
 
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE, JOB_PROGRESS
+from lcm.jobs.enum import JOB_TYPE, JOB_PROGRESS, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.pub.utils.restcall import req_by_msb
 
@@ -40,7 +40,7 @@ class VerifyVnfs(threading.Thread):
     def run(self):
         try:
             self.verify_config = self.load_config()
-            JobUtil.create_job("VNF", JOB_TYPE.CREATE_VNF, self.job_id, 'vnfsdk', self.job_id)
+            JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.CREATE, self.job_id, 'vnfsdk', self.job_id)
             self.do_on_boarding()
             self.do_inst_vnf()
             self.do_func_test()

diff --git a/lcm/ns_vnfs/biz/wait_job.py b/lcm/ns_vnfs/biz/wait_job.py
index 3472496..f73d556 100644 (file)
--- a/lcm/ns_vnfs/biz/wait_job.py
+++ b/lcm/ns_vnfs/biz/wait_job.py
@@ -18,7 +18,7 @@ import logging
 import math
 
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_MODEL_STATUS
+from lcm.jobs.enum import JOB_MODEL_STATUS
 from lcm.pub.msapi.vnfmdriver import query_vnfm_job
 from lcm.pub.utils.values import ignore_case_get
 

diff --git a/lcm/ns_vnfs/tests/tests.py b/lcm/ns_vnfs/tests/tests.py
index 12282fb..cb88ddc 100644 (file)
--- a/lcm/ns_vnfs/tests/tests.py
+++ b/lcm/ns_vnfs/tests/tests.py
@@ -21,7 +21,7 @@ from rest_framework import status
 from lcm.pub.database.models import NfInstModel, JobModel, NSInstModel, VmInstModel, OOFDataModel, SubscriptionModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils import restcall
-from lcm.pub.enum import JOB_MODEL_STATUS, JOB_TYPE
+from lcm.jobs.enum import JOB_MODEL_STATUS, JOB_TYPE, JOB_ACTION
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
@@ -264,7 +264,7 @@ class TestTerminateVnfViews(TestCase):
     @mock.patch.object(restcall, 'call_req')
     @mock.patch.object(SubscriptionDeletion, 'send_subscription_deletion_request')
     def test_terminate_vnf(self, mock_send_subscription_deletion_request, mock_call_req):
-        job_id = JobUtil.create_job("VNF", JOB_TYPE.TERMINATE_VNF, self.nf_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.TERMINATE, self.nf_inst_id)
 
         nfinst = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
         if nfinst:
@@ -531,7 +531,7 @@ class TestHealVnfViews(TestCase):
         self.nf_inst_id = str(uuid.uuid4())
         self.nf_uuid = '111'
 
-        self.job_id = JobUtil.create_job("VNF", JOB_TYPE.HEAL_VNF, self.nf_inst_id)
+        self.job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.HEAL, self.nf_inst_id)
 
         NSInstModel(id=self.ns_inst_id, name="ns_name").save()
         NfInstModel.objects.create(nfinstid=self.nf_inst_id,

diff --git a/lcm/ns_vnfs/views/views.py b/lcm/ns_vnfs/views/views.py
index 7d53d4c..b2c07ec 100644 (file)
--- a/lcm/ns_vnfs/views/views.py
+++ b/lcm/ns_vnfs/views/views.py
@@ -23,7 +23,7 @@ from rest_framework.views import APIView
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.msapi.extsys import get_vnfm_by_id, get_vim_by_id_vim_info
 from lcm.pub.utils.jobutil import JobUtil
-from lcm.pub.enum import JOB_TYPE
+from lcm.jobs.enum import JOB_TYPE, JOB_ACTION
 from lcm.pub.utils.values import ignore_case_get
 from lcm.ns_vnfs.biz.create_vnfs import CreateVnfs
 from lcm.ns_vnfs.biz.get_vnfs import GetVnf, GetVnfVms
@@ -133,14 +133,14 @@ class NfTerminate(APIView):
         vnf_inst_id = vnfinstid
         terminationType = ignore_case_get(request.data, 'terminationType')
         gracefulTerminationTimeout = ignore_case_get(request.data, 'gracefulTerminationTimeout')
-        job_id = JobUtil.create_job("VNF", JOB_TYPE.TERMINATE_VNF, vnf_inst_id)
+        job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.TERMINATE, vnf_inst_id)
         data = {'terminationType': terminationType, 'gracefulTerminationTimeout': gracefulTerminationTimeout}
         logger.debug("data=%s", data)
         try:
             TerminateVnfs(data, vnf_inst_id, job_id).start()
         except Exception as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            logger.error(e.args[0])
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
         rsp = {'jobId': job_id}
 
         resp_serializer = TerminateVnfRespSerializer(data=rsp)
@@ -166,7 +166,7 @@ class NfGrant(APIView):
                 raise Exception(req_serializer.errors)
 
             vnf_inst_id = ignore_case_get(request.data, 'vnfInstanceId')
-            job_id = JobUtil.create_job("VNF", JOB_TYPE.GRANT_VNF, vnf_inst_id)
+            job_id = JobUtil.create_job(JOB_TYPE.VNF, JOB_ACTION.GRANT, vnf_inst_id)
             rsp = GrantVnfs(request.data, job_id).send_grant_vnf_to_resMgr()
             """
             rsp = {
@@ -184,9 +184,9 @@ class NfGrant(APIView):
 
             return Response(data=rsp, status=status.HTTP_201_CREATED)
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
 
 
 class NfPlacement(APIView):
@@ -206,9 +206,9 @@ class NfPlacement(APIView):
             PlaceVnfs(request.data).extract()
             return Response(data={}, status=status.HTTP_200_OK)
         except Exception as e:
-            logger.error(e.message)
+            logger.error(e.args[0])
             logger.error(traceback.format_exc())
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
 
 
 class LcmNotify(APIView):
@@ -229,8 +229,8 @@ class LcmNotify(APIView):
             NotifyLcm(vnfmid, vnfInstanceId, request.data).do_biz()
             return Response(data={}, status=status.HTTP_201_CREATED)
         except Exception as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            logger.error(e.ars[0])
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
 
 
 class NfScaleView(APIView):
@@ -250,8 +250,8 @@ class NfScaleView(APIView):
             NFManualScaleService(vnfinstid, request.data).start()
             return Response(data={}, status=status.HTTP_202_ACCEPTED)
         except Exception as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            logger.error(e.args[0])
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
 
 
 class NfVerifyView(APIView):
@@ -279,8 +279,8 @@ class NfVerifyView(APIView):
 
             return Response(data=rsp, status=status.HTTP_202_ACCEPTED)
         except Exception as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_409_CONFLICT)
+            logger.error(e.args[0])
+            return Response(data={'error': '%s' % e.args[0]}, status=status.HTTP_409_CONFLICT)
 
 
 class NfVnfmInfoView(APIView):
@@ -301,10 +301,10 @@ class NfVnfmInfoView(APIView):
                 raise Exception(resp_serializer.errors)
 
         except NSLCMException as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            logger.error(e.args[0])
+            return Response(data={'error': '%s' % 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 Response(data={'error': 'Failed to get vnfm info.'},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -331,10 +331,10 @@ class NfVimInfoView(APIView):
                 raise Exception(resp_serializer.errors)
 
         except NSLCMException as e:
-            logger.error(e.message)
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+            logger.error(e.args[0])
+            return Response(data={'error': '%s' % 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 Response(data={'error': 'Failed to get vim info.'},
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)

diff --git a/lcm/pub/utils/jobutil.py b/lcm/pub/utils/jobutil.py
index 414e6ba..396392f 100644 (file)
--- a/lcm/pub/utils/jobutil.py
+++ b/lcm/pub/utils/jobutil.py
@@ -18,8 +18,8 @@ import traceback
 import uuid
 
 from lcm.pub.database.models import JobStatusModel, JobModel
-from lcm.pub.enum import JOB_PROGRESS
-from lcm.pub.enum import JOB_STATUS
+from lcm.jobs.enum import JOB_PROGRESS
+from lcm.jobs.enum import JOB_STATUS
 from lcm.pub.utils import idutil
 
 logger = logging.getLogger(__name__)
@@ -54,14 +54,14 @@ class JobUtil(object):
         return len(jobs) > 0
 
     @staticmethod
-    def create_job(inst_type, jobaction, inst_id, user='', job_id=None, res_name=''):
+    def create_job(job_type, job_action, inst_id, user='', job_id=None, res_name=''):
         if job_id is None:
             job_id = JobUtil.__gen_job_id(
-                '%s-%s-%s' % (str(inst_type).replace(' ', '_'), str(jobaction).replace(' ', '_'), str(inst_id)))
+                '%s-%s-%s' % (str(job_type).replace(' ', '_'), str(job_action).replace(' ', '_'), str(inst_id)))
         job = JobModel()
         job.jobid = job_id
-        job.jobtype = inst_type
-        job.jobaction = jobaction
+        job.jobtype = job_type
+        job.jobaction = job_action
         job.resid = str(inst_id)
         job.status = JOB_STATUS.PROCESSING
         job.user = user

diff --git a/lcm/pub/utils/tests.py b/lcm/pub/utils/tests.py
index 5a2bc15..7ea2120 100644 (file)
--- a/lcm/pub/utils/tests.py
+++ b/lcm/pub/utils/tests.py
@@ -107,8 +107,8 @@ class UtilsTest(unittest.TestCase):
         job_id = "5"
         JobModel.objects.filter().delete()
         JobUtil.create_job(
-            inst_type="1",
-            jobaction="2",
+            job_type="1",
+            job_action="2",
             inst_id="3",
             user="4",
             job_id=5,