aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-09-20 16:34:20 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-09-20 16:34:20 +0800
commit2bc2a4c677b5896254f4e957cb5974e4028dfb50 (patch)
tree0a4b0e161ce391b5300bbc68630d1b3abd0820f6
parent73dc3eda8c4e8ab8a089b0945a3e94892d4956dd (diff)
Rename nfvolcm.py file to nslcm.py
Change-Id: I1103bbefe9b03e9423dddae51f1f4ecdd6bfcda1 Issue-ID: VFC-401 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r--catalog/packages/nf_package.py6
-rw-r--r--catalog/packages/ns_package.py6
-rw-r--r--catalog/packages/tests.py6
-rw-r--r--catalog/pub/msapi/nslcm.py (renamed from catalog/pub/msapi/nfvolcm.py)0
4 files changed, 9 insertions, 9 deletions
diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index b07c5839..a89c826b 100644
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -22,7 +22,7 @@ import traceback
from catalog.pub.config.config import CATALOG_ROOT_PATH
from catalog.pub.database.models import VnfPackageModel
from catalog.pub.exceptions import CatalogException
-from catalog.pub.msapi import nfvolcm
+from catalog.pub.msapi import nslcm
from catalog.pub.msapi import sdc
from catalog.pub.utils import fileutil
from catalog.pub.utils import toscaparser
@@ -184,7 +184,7 @@ class NfPkgDeleteThread(threading.Thread):
if NfInstModel.objects.filter(package_id=self.csar_id):
raise CatalogException("NfInst by csar(%s) exists, cannot delete." % self.csar_id)
'''
- nfvolcm.delete_nf_inst_mock()
+ nslcm.delete_nf_inst_mock()
JobUtil.add_job_status(self.job_id, 50, "Delete CSAR(%s) from Database." % self.csar_id)
if not VnfPackageModel.objects.filter(vnfPackageId=self.csar_id):
@@ -230,7 +230,7 @@ class NfPackage(object):
#vnf_insts = NfInstModel.objects.filter(package_id=csar_id)
- vnf_insts = nfvolcm.get_vnfInstances()
+ vnf_insts = nslcm.get_vnfInstances()
vnf_inst_info = [{"vnfInstanceId": vnf_inst["vnfInstanceId"],
"vnfInstanceName": vnf_inst["vnfInstanceName"]} for vnf_inst in vnf_insts]
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index 17ce9337..a8141303 100644
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -21,7 +21,7 @@ import traceback
from catalog.pub.config.config import CATALOG_ROOT_PATH
from catalog.pub.database.models import NSPackageModel, VnfPackageModel
from catalog.pub.exceptions import CatalogException
-from catalog.pub.msapi import nfvolcm
+from catalog.pub.msapi import nslcm
from catalog.pub.msapi import sdc
from catalog.pub.utils import fileutil
from catalog.pub.utils import toscaparser
@@ -56,7 +56,7 @@ def ns_delete_csar(csar_id, force_delete):
if force_delete:
ret = NsPackage().delete_csar(csar_id)
return fmt_ns_pkg_rsp(STATUS_SUCCESS, ret[1], "")
- if nfvolcm.get_nsInstances(csar_id):
+ if nslcm.get_nsInstances(csar_id):
return fmt_ns_pkg_rsp(STATUS_FAILED,
"NS instances using CSAR(%s) already exists!" % csar_id)
ret = NsPackage().delete_csar(csar_id)
@@ -184,7 +184,7 @@ class NsPackage(object):
package_info["nsdProvider"] = csars[0].nsdDesginer
package_info["nsdVersion"] = csars[0].nsdVersion
- nss = nfvolcm.get_nsInstances(csar_id)
+ nss = nslcm.get_nsInstances(csar_id)
ns_instance_info = [{
"nsInstanceId": ns["nsInstanceId"],
"nsInstanceName": ns["nsName"]} for ns in nss]
diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py
index 6c8d4ae9..dd3d0592 100644
--- a/catalog/packages/tests.py
+++ b/catalog/packages/tests.py
@@ -24,7 +24,7 @@ from catalog.packages.nf_package import NfDistributeThread
from catalog.packages.nf_package import NfPkgDeleteThread
from catalog.packages.ns_package import NsPackage
from catalog.pub.database.models import NSPackageModel, VnfPackageModel, JobStatusModel
-from catalog.pub.msapi import nfvolcm
+from catalog.pub.msapi import nslcm
class PackageTest(unittest.TestCase):
@@ -119,7 +119,7 @@ class PackageTest(unittest.TestCase):
@mock.patch.object(NfDistributeThread, 'get_vnfd')
@mock.patch.object(NsPackage,'get_nsd')
- @mock.patch.object(nfvolcm,'get_nsInstances')
+ @mock.patch.object(nslcm, 'get_nsInstances')
def test_ns_package_delete(self, mock_get_nsInstances,mock_get_nsd,mock_get_vnfd):
# First distribute a VNF
@@ -148,7 +148,7 @@ class PackageTest(unittest.TestCase):
@mock.patch.object(NfDistributeThread, 'get_vnfd')
@mock.patch.object(NsPackage,'get_nsd')
- @mock.patch.object(nfvolcm,'get_nsInstances')
+ @mock.patch.object(nslcm, 'get_nsInstances')
def test_ns_package_delete_force(self, mock_get_nsInstances,mock_get_nsd,mock_get_vnfd):
# First distribute a VNF
diff --git a/catalog/pub/msapi/nfvolcm.py b/catalog/pub/msapi/nslcm.py
index 33e169c6..33e169c6 100644
--- a/catalog/pub/msapi/nfvolcm.py
+++ b/catalog/pub/msapi/nslcm.py