projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rollback error of not launched nets & vms
[osm/RO.git]
/
osm_ro
/
nfvo.py
diff --git
a/osm_ro/nfvo.py
b/osm_ro/nfvo.py
index
94b029a
..
8f105c3
100644
(file)
--- a/
osm_ro/nfvo.py
+++ b/
osm_ro/nfvo.py
@@
-334,7
+334,9
@@
def rollback(mydb, vims, rollback_list):
if item["where"]=="vim":
if item["vim_id"] not in vims:
continue
if item["where"]=="vim":
if item["vim_id"] not in vims:
continue
- vim=vims[ item["vim_id"] ]
+ if is_task_id(item["uuid"]):
+ continue
+ vim = vims[item["vim_id"]]
try:
if item["what"]=="image":
vim.delete_image(item["uuid"])
try:
if item["what"]=="image":
vim.delete_image(item["uuid"])
@@
-481,7
+483,7
@@
def check_vnf_descriptor(vnf_descriptor, vnf_descriptor_version=1):
HTTP_Bad_Request)
HTTP_Bad_Request)
-def create_or_use_image(mydb, vims, image_dict, rollback_list, only_create_at_vim=False, return_on_error
=
None):
+def create_or_use_image(mydb, vims, image_dict, rollback_list, only_create_at_vim=False, return_on_error
=
None):
#look if image exist
if only_create_at_vim:
image_mano_id = image_dict['uuid']
#look if image exist
if only_create_at_vim:
image_mano_id = image_dict['uuid']