Merge "Change vfc-nslcm swagger url directory"

[vfc/nfvo/lcm.git] / lcm / ns / ns_manual_scale.py

diff --git a/lcm/ns/ns_manual_scale.py b/lcm/ns/ns_manual_scale.py
index b256e61..2870ed7 100644 (file)
--- a/lcm/ns/ns_manual_scale.py
+++ b/lcm/ns/ns_manual_scale.py
@@ -23,7 +23,7 @@ from lcm.pub.database.models import JobModel, NSInstModel
 from lcm.pub.exceptions import NSLCMException
 from lcm.pub.utils.jobutil import JobUtil, JOB_MODEL_STATUS
 from lcm.pub.utils.values import ignore_case_get
-from lcm.pub.utils.scaleaspect import get_scale_vnf_data
+from lcm.pub.utils.scaleaspect import get_scale_vnf_data_info_list
 
 JOB_ERROR = 255
 SCALE_TYPE = ("SCALE_NS", "SCALE_VNF")
@@ -36,9 +36,7 @@ class NSManualScaleService(threading.Thread):
         self.ns_instance_id = ns_instance_id
         self.request_data = request_data
         self.job_id = job_id
-        self.scale_type = ''
         self.scale_vnf_data = ''
-        self.scale_ns_data = ''
 
     def run(self):
         try:
@@ -55,54 +53,55 @@ class NSManualScaleService(threading.Thread):
     def do_biz(self):
         self.update_job(1, desc='ns scale start')
         self.update_ns_status(NS_INST_STATUS.SCALING)
-        self.get_and_check_params()
+        self.check_and_set_params()
         self.do_vnfs_scale()
         self.update_job(100, desc='ns scale success')
 
-    def get_and_check_params(self):
-        self.scale_type = ignore_case_get(self.request_data, 'scaleType')
-        if not self.scale_type or self.scale_type != SCALE_TYPE[0]:
-            logger.error('scaleType parameter does not exist or value is incorrect. It must be SCALE_NS.')
-            raise NSLCMException('scaleType parameter does not exist or value incorrect. It must be SCALE_NS.')
+    def check_and_set_params(self):
+        scale_type = ignore_case_get(self.request_data, 'scaleType')
+        if scale_type != SCALE_TYPE[0]:
+            raise NSLCMException('scaleType should be SCALE_NS.')
 
-        # Get data if SCALE_NS
-        self.scale_ns_data = ignore_case_get(self.request_data, 'scaleNsData')
-        self.scale_vnf_data = get_scale_vnf_data(self.scale_ns_data, self.ns_instance_id)
+        scale_ns_data = ignore_case_get(self.request_data, 'scaleNsData')
+        self.scale_vnf_data = get_scale_vnf_data_info_list(
+            scale_ns_data, self.ns_instance_id)
         logger.debug('scale_vnf_data = %s' % self.scale_vnf_data)
-        # Get data if SCALE_VNF
         if not self.scale_vnf_data:
-            logger.error('scaleVnfData parameter does not exist or value incorrect')
-            raise NSLCMException('scaleVnfData parameter does not exist or value incorrect')
+            raise NSLCMException('Failed to get scaleVnfData parameter')
 
     def do_vnfs_scale(self):
         for i in range(len(self.scale_vnf_data)):
-            vnf_scale_params = self.prepare_vnf_scale_params(self.scale_vnf_data[i])
+            vnf_scale_params = self.prepare_vnf_scale_params(
+                self.scale_vnf_data[i])
             count = len(self.scale_vnf_data)
             progress_range = [11 + 80 / count * i, 10 + 80 / count * (i + 1)]
             status = self.do_vnf_scale(vnf_scale_params, progress_range)
             if status is JOB_MODEL_STATUS.FINISHED:
-                logger.info('nf[%s] scale handle end' % vnf_scale_params.get('vnfInstanceId'))
-                self.update_job(progress_range[1],
-                                desc='nf[%s] scale handle end' % vnf_scale_params.get('vnfInstanceId'))
+                logger.info(
+                    'nf[%s] scale handle end' %
+                    vnf_scale_params.get('vnfInstanceId'))
+                self.update_job(
+                    progress_range[1],
+                    desc='nf[%s] scale handle end' %
+                    vnf_scale_params.get('vnfInstanceId'))
             else:
-                logger.error('nf scale failed')
-                raise NSLCMException('nf scale failed')
+                raise NSLCMException('VNF scale failed')
 
     def prepare_vnf_scale_params(self, vnf_data):
-        vnf_instance_id = ignore_case_get(vnf_data, 'vnfInstanceId')
-        scale_by_step_data = ignore_case_get(vnf_data, 'scaleByStepData')
-        result = {
-            "vnfInstanceId": vnf_instance_id,
-            "scaleVnfData": scale_by_step_data,
+        return {
+            "vnfInstanceId": ignore_case_get(vnf_data, 'vnfInstanceId'),
+            "scaleVnfData": ignore_case_get(vnf_data, 'scaleByStepData'),
             "nsInstanceId": self.ns_instance_id
         }
-        return result
 
     def do_vnf_scale(self, vnf_scale_params, progress_range):
         nf_inst_id = vnf_scale_params.get('vnfInstanceId')
         nf_service = NFManualScaleService(nf_inst_id, vnf_scale_params)
         nf_service.start()
-        self.update_job(progress_range[0], desc='nf[%s] scale handle start' % nf_inst_id)
+        self.update_job(
+            progress_range[0],
+            desc='nf[%s] scale handle start' %
+            nf_inst_id)
         status = self.wait_job_finish(nf_service.job_id)
         return status
 
@@ -116,14 +115,14 @@ class NSManualScaleService(threading.Thread):
             end_time = datetime.datetime.now()
             if job_result.progress == 100:
                 return JOB_MODEL_STATUS.FINISHED
-            elif job_result.progress > 100:
+            if job_result.progress > 100:
                 return JOB_MODEL_STATUS.ERROR
-            else:
-                continue
         return JOB_MODEL_STATUS.TIMEOUT
 
     def update_job(self, progress, desc=''):
         JobUtil.add_job_status(self.job_id, progress, desc)
 
     def update_ns_status(self, status):
-        NSInstModel.objects.filter(id=self.ns_instance_id).update(status=status)
+        NSInstModel.objects.filter(
+            id=self.ns_instance_id).update(
+            status=status)