Add a new test case

[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 dc2d1b4..7a17f58 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_package
 
 JOB_ERROR = 255
 SCALE_TYPE = ("SCALE_NS", "SCALE_VNF")
@@ -45,7 +45,8 @@ class NSManualScaleService(threading.Thread):
             self.do_biz()
         except NSLCMException as e:
             JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
-        except:
+        except Exception as ex:
+            logger.error(ex.message)
             logger.error(traceback.format_exc())
             JobUtil.add_job_status(self.job_id, JOB_ERROR, 'ns scale fail')
         finally:
@@ -65,11 +66,10 @@ class NSManualScaleService(threading.Thread):
             raise NSLCMException('scaleType parameter does not exist or value incorrect. It must 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)
+        self.scale_ns_data = ignore_case_get(self.request_data, 'scaleNsByStepsData')
+        self.scale_vnf_data = get_scale_vnf_data_package(self.scale_ns_data, self.ns_instance_id)
         logger.debug('scale_vnf_data = %s' % self.scale_vnf_data)
         # Get data if SCALE_VNF
-        #self.scale_vnf_data = ignore_case_get(self.request_data, 'scaleVnfData')
         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')
@@ -93,7 +93,7 @@ class NSManualScaleService(threading.Thread):
         scale_by_step_data = ignore_case_get(vnf_data, 'scaleByStepData')
         result = {
             "vnfInstanceId": vnf_instance_id,
-            "scaleByStepData": scale_by_step_data,
+            "scaleVnfData": scale_by_step_data,
             "nsInstanceId": self.ns_instance_id
         }
         return result