Add UT cases for sfc

[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..b256e61 100644 (file)
--- a/lcm/ns/ns_manual_scale.py
+++ b/lcm/ns/ns_manual_scale.py
@@ -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:
@@ -66,10 +67,9 @@ class NSManualScaleService(threading.Thread):
 
         # 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_vnf_data = get_scale_vnf_data(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