aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-11-10 15:40:39 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-11-10 15:40:39 +0800
commit66e8f0b03e23b28ddefb2d678666ab5f4a813eb3 (patch)
tree533b0c77d0af1a267de138a5904cd78ec5f00943
parent6c6979f0eaab440408c2e1cf9bc27c1996d83bf5 (diff)
Fix vfc-lcm vnf report bug
Change-Id: I0eea316a6981ce62cf6e0dc6a8f56b7521920df0 Issue-ID: VFC-589 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r--lcm/ns/vnfs/create_vnfs.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lcm/ns/vnfs/create_vnfs.py b/lcm/ns/vnfs/create_vnfs.py
index 5dba4e92..58b02f55 100644
--- a/lcm/ns/vnfs/create_vnfs.py
+++ b/lcm/ns/vnfs/create_vnfs.py
@@ -71,6 +71,9 @@ class CreateVnfs(Thread):
self.get_params()
self.check_nf_name_exist()
self.get_vnfd_id()
+ if REPORT_TO_AAI:
+ self.create_vnf_in_aai()
+ # self.create_vserver_in_aai()
self.check_nf_package_valid()
self.send_nf_init_request_to_vnfm()
self.send_get_vnfm_request_to_extsys()
@@ -78,9 +81,6 @@ class CreateVnfs(Thread):
self.wait_vnfm_job_finish()
self.write_vnf_creation_info()
self.save_info_to_db()
- if REPORT_TO_AAI:
- self.create_vnf_in_aai()
- # self.create_vserver_in_aai()
JobUtil.add_job_status(self.job_id, 100, 'vnf instantiation success', 0)
except NSLCMException as e:
self.vnf_inst_failed_handle(e.message)
@@ -328,7 +328,7 @@ class CreateVnfs(Thread):
# query vim_info from aai
vim_info = get_vim_by_id(self.vim_id)
- tenant_id = vim_info["tenant"]
+ tenant_id = vim_info["tenantId"]
vm_inst_infos = VmInstModel.objects.filter(insttype=INST_TYPE.VNF, instid=self.nf_inst_id)
for vm_inst_info in vm_inst_infos:
vserver_id = vm_inst_info.resouceid