From: hewei-cmss <hewei@cmss.chinamobile.com>
Date: Wed, 4 Sep 2019 09:36:58 +0000 (+0800)
Subject: refactor file name
X-Git-Tag: 1.3.7~48
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a6126f7c94e5ab9454066e69083e9955589f3402;p=vfc%2Fnfvo%2Flcm.git

refactor file name

Issue-ID: VFC-1504

Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: I5a37e89bdd2af58ba1478a659e9586c2393ad973
---

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
similarity index 100%
rename from lcm/ns/biz/scaleaspect.py
rename to 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