diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2018-04-13 01:48:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-13 01:48:48 +0000 |
| commit | 11d0522e83e2d291d9513cca5f108293fe532af4 (patch) | |
| tree | 1f884c2db72996b2717989b8ca79dbe9ee3b3d22 | |
| parent | 24aaa782fcb3e543dcee8c18fae2101b1a46ffb9 (diff) | |
| parent | 2bb58fc571068d72f6d105988e8db6c70246616e (diff) | |
Merge "Remove vfc_vnflcm spare code"
| -rw-r--r-- | lcm/lcm/nf/vnf_cancel/term_vnf.py | 2 | ||||
| -rw-r--r-- | lcm/lcm/nf/vnf_create/inst_vnf.py | 8 |
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, |