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
fix VNF query result none exception
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
nf
/
biz
/
query_vnf.py
diff --git
a/lcm/lcm/nf/biz/query_vnf.py
b/lcm/lcm/nf/biz/query_vnf.py
index
09fab6c
..
1dd7c2d
100644
(file)
--- a/
lcm/lcm/nf/biz/query_vnf.py
+++ b/
lcm/lcm/nf/biz/query_vnf.py
@@
-35,11
+35,12
@@
class QueryVnf:
def query_multi_vnf(self):
vnf_insts = NfInstModel.objects.all()
def query_multi_vnf(self):
vnf_insts = NfInstModel.objects.all()
- if not vnf_insts:
- raise NFLCMException('VnfInsts does not exist.')
+
#
if not vnf_insts:
+
#
raise NFLCMException('VnfInsts does not exist.')
resp_data = []
resp_data = []
- for vnf_inst in vnf_insts:
- resp_data.append(self.fill_resp_data(vnf_inst))
+ if vnf_insts:
+ for vnf_inst in vnf_insts:
+ resp_data.append(self.fill_resp_data(vnf_inst))
return resp_data
def fill_resp_data(self, vnf):
return resp_data
def fill_resp_data(self, vnf):
@@
-51,7
+52,7
@@
class QueryVnf:
"id": s.storageid,
"storageResource": {
"vimConnectionId": s.vimid,
"id": s.storageid,
"storageResource": {
"vimConnectionId": s.vimid,
- "resourceId": s.resouceid
+ "resourceId": s.resou
r
ceid
}
}
arr.append(storage)
}
}
arr.append(storage)
@@
-67,7
+68,7
@@
class QueryVnf:
"virtualLinkDescId": v.vldid,
"networkResource": {
"vimConnectionId": net[0].vimid,
"virtualLinkDescId": v.vldid,
"networkResource": {
"vimConnectionId": net[0].vimid,
- "resourceId": net[0].resouceid
+ "resourceId": net[0].resou
r
ceid
}
}
vl_arr.append(v_dic)
}
}
vl_arr.append(v_dic)
@@
-78,16
+79,16
@@
class QueryVnf:
vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
if not vm:
raise NFLCMException('VmInst(%s) does not exist.' % vnfc.vmid)
vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
if not vm:
raise NFLCMException('VmInst(%s) does not exist.' % vnfc.vmid)
- storage = StorageInstModel.objects.filter(vimid=vm[0].vmid)
- # TODO: previously, ownerid=vm[0].vmid, but ownerid is not a field of StorageInstModel.
-
if not storag
e:
- raise NFLCMException('StorageInst(%s) does not exist.' % vm[0].vmid)
+ if vm[0].volume_array:
+ storage = StorageInstModel.objects.filter(resourceid__in=vm[0].volume_array)
+
els
e:
+ storage = []
vnfc_dic = {
"id": vnfc.vnfcinstanceid,
"vduId": vnfc.vduid,
"computeResource": {
"vimConnectionId": vm[0].vimid,
vnfc_dic = {
"id": vnfc.vnfcinstanceid,
"vduId": vnfc.vduid,
"computeResource": {
"vimConnectionId": vm[0].vimid,
- "resourceId": vm[0].resouceid
+ "resourceId": vm[0].resou
r
ceid
},
"storageResourceIds": [s.storageid for s in storage]
}
},
"storageResourceIds": [s.storageid for s in storage]
}