diff options
| author |   hewei-cmss <hewei@cmss.chinamobile.com> | 2019-09-04 17:36:58 +0800 |
|---|---|---|
| committer | hewei-cmss <hewei@cmss.chinamobile.com> | 2019-09-04 17:51:11 +0800 |
| commit | a6126f7c94e5ab9454066e69083e9955589f3402 (patch) | |
| tree | bcb4f80e2a29240adf5ec1deb07e180ff8d19f87 | |
| parent | 2dc27ce8f84c77d3e2fe02576a222683aa19adf4 (diff) | |
refactor file name
Issue-ID: VFC-1504
Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: I5a37e89bdd2af58ba1478a659e9586c2393ad973
| -rw-r--r-- | lcm/ns/biz/ns_manual_scale.py | 4 | ||||
| -rw-r--r-- | lcm/ns/biz/scale_aspect.py (renamed from lcm/ns/biz/scaleaspect.py) | 0 | ||||
| -rw-r--r-- | lcm/ns/tests/test_scaleaspect.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lcm/ns/biz/ns_manual_scale.py b/lcm/ns/biz/ns_manual_scale.py index ecf7eeda..6d4e9386 100644 --- a/lcm/ns/biz/ns_manual_scale.py +++ b/lcm/ns/biz/ns_manual_scale.py @@ -17,7 +17,7 @@ import threading import time import traceback -from lcm.ns.biz.scaleaspect import get_scale_vnf_data_info_list +from lcm.ns.biz.scale_aspect import get_scale_vnf_data_info_list from lcm.ns.enum import NS_INST_STATUS from lcm.pub.database.models import JobModel, NSInstModel from lcm.pub.exceptions import NSLCMException @@ -56,7 +56,7 @@ class NSManualScaleService(threading.Thread): self.update_ns_status(NS_INST_STATUS.ACTIVE) def do_biz(self): - self.update_job(1, desc='ns scale start') + self.update_job(JOB_PROGRESS.STARTED, desc='ns scale start') self.update_ns_status(NS_INST_STATUS.SCALING) self.check_and_set_params() self.do_vnfs_scale() diff --git a/lcm/ns/biz/scaleaspect.py b/lcm/ns/biz/scale_aspect.py index 21842cd5..21842cd5 100644 --- a/lcm/ns/biz/scaleaspect.py +++ b/lcm/ns/biz/scale_aspect.py diff --git a/lcm/ns/tests/test_scaleaspect.py b/lcm/ns/tests/test_scaleaspect.py index f44e7544..df41be9f 100644 --- a/lcm/ns/tests/test_scaleaspect.py +++ b/lcm/ns/tests/test_scaleaspect.py @@ -17,7 +17,7 @@ import os from django.test import TestCase from lcm.pub.database.models import NSInstModel, NfInstModel from lcm.ns_vnfs.enum import VNF_STATUS -from lcm.ns.biz.scaleaspect import mapping_conv, get_vnf_instance_id_list, check_scale_list, get_scale_vnf_data, \ +from lcm.ns.biz.scale_aspect import mapping_conv, get_vnf_instance_id_list, check_scale_list, get_scale_vnf_data, \ get_nsdId, check_and_set_params, get_scale_vnf_data_info_list, get_vnf_scale_info, get_scale_vnf_data_from_json |