summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2018-04-12 17:35:22 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2018-04-12 17:35:22 +0800
commit2bb58fc571068d72f6d105988e8db6c70246616e (patch)
treed383d1a3d68d041c5938a495fa038dc9def77c41 /lcm
parent68f003bbc30b5c8537fbefcfbd1517b393fea8b0 (diff)
Remove vfc_vnflcm spare code
Change-Id: Ie6835f2114e97308e636229b2a44de287bfaf9be Issue-ID: VFC-873 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/vnf_cancel/term_vnf.py2
-rw-r--r--lcm/lcm/nf/vnf_create/inst_vnf.py8
2 files changed, 2 insertions, 8 deletions
diff --git a/lcm/lcm/nf/vnf_cancel/term_vnf.py b/lcm/lcm/nf/vnf_cancel/term_vnf.py
index 8657594b..1dd8067f 100644
--- a/lcm/lcm/nf/vnf_cancel/term_vnf.py
+++ b/lcm/lcm/nf/vnf_cancel/term_vnf.py
@@ -38,8 +38,6 @@ class TermVnf(Thread):
self.job_id = job_id
self.terminationType = ignore_case_get(self.data, "terminationType")
self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout")
- self.apply_result = None
- self.notify_data = None
self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
def run(self):
diff --git a/lcm/lcm/nf/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnf_create/inst_vnf.py
index c94bfee0..9ae25151 100644
--- a/lcm/lcm/nf/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnf_create/inst_vnf.py
@@ -37,12 +37,7 @@ class InstVnf(Thread):
self.data = data
self.nf_inst_id = nf_inst_id
self.job_id = job_id
- self.vnfd_id = ''
self.vim_id = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "vimId")
- self.nfvo_inst_id = ''
- self.vnfm_inst_id = ''
- self.package_id = ''
- self.vnfd_info = []
def run(self):
try:
@@ -81,12 +76,13 @@ class InstVnf(Thread):
self.update_cps()
metadata = ignore_case_get(self.vnfd_info, "metadata")
+ csar_id = ignore_case_get(metadata, "id")
version = ignore_case_get(metadata, "vnfdVersion")
vendor = ignore_case_get(metadata, "vendor")
netype = ignore_case_get(metadata, "type")
vnfsoftwareversion = ignore_case_get(metadata, "version")
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).\
- update(package_id=self.package_id,
+ update(package_id=csar_id,
flavour_id=ignore_case_get(self.data, "flavourId"),
version=version,
vendor=vendor,