Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add test case of create volume failed
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
nf
/
vnfs
/
vnf_create
/
inst_vnf.py
diff --git
a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
index
3cd689e
..
d9f8c8b
100644
(file)
--- a/
lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/
lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
@@
-374,7
+374,7
@@
class InstVnf(Thread):
vimid=ret["vimId"],
resouceid=ret["id"],
name=ret["name"],
vimid=ret["vimId"],
resouceid=ret["id"],
name=ret["name"],
- tenant=ret["tenatId"],
+ tenant=ret["tena
n
tId"],
insttype=0,
is_predefined=ret["returnCode"],
instid=self.nf_inst_id)
insttype=0,
is_predefined=ret["returnCode"],
instid=self.nf_inst_id)
@@
-386,13
+386,13
@@
class InstVnf(Thread):
# self.inst_resource['network'].append({"vim_id": "1"}, {"res_id": "2"})
JobUtil.add_job_status(self.job_id, 35, 'Create networks!')
NetworkInstModel.objects.create(
# self.inst_resource['network'].append({"vim_id": "1"}, {"res_id": "2"})
JobUtil.add_job_status(self.job_id, 35, 'Create networks!')
NetworkInstModel.objects.create(
- networkid=
ret["id"]
,
- vimid =
ret["vimId"]
,
- resouceid =
ret["id"]
,
- name =
ret["name"]
,
- tenant =
ret["tenatId"]
,
+ networkid=
ignore_case_get(ret, "id")
,
+ vimid =
ignore_case_get(ret, "vimId")
,
+ resouceid =
ignore_case_get(ret, "id")
,
+ name =
ignore_case_get(ret, "name")
,
+ tenant =
ignore_case_get(ret, "tenatId")
,
insttype = 0,
insttype = 0,
- is_predefined =
ret["returnCode"]
,
+ is_predefined =
ignore_case_get(ret, "returnCode")
,
instid = self.nf_inst_id)
elif res_type == adaptor.RES_SUBNET:
logger.info('Create subnets!')
instid = self.nf_inst_id)
elif res_type == adaptor.RES_SUBNET:
logger.info('Create subnets!')