projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 608 Database migration recovering with docker relaunch
[osm/RO.git]
/
osm_ro
/
nfvo.py
diff --git
a/osm_ro/nfvo.py
b/osm_ro/nfvo.py
index
7225da5
..
00738e9
100644
(file)
--- a/
osm_ro/nfvo.py
+++ b/
osm_ro/nfvo.py
@@
-343,7
+343,7
@@
def get_imagelist(mydb, vnf_id, nfvo_tenant=None):
image_list = []
vms = mydb.get_rows(SELECT=('image_id','image_list'), FROM='vms', WHERE={'vnf_id': vnf_id})
for vm in vms:
image_list = []
vms = mydb.get_rows(SELECT=('image_id','image_list'), FROM='vms', WHERE={'vnf_id': vnf_id})
for vm in vms:
- if vm["image_id"] not in image_list:
+ if vm["image_id"]
and vm["image_id"]
not in image_list:
image_list.append(vm["image_id"])
if vm["image_list"]:
vm_image_list = yaml.load(vm["image_list"])
image_list.append(vm["image_id"])
if vm["image_list"]:
vm_image_list = yaml.load(vm["image_list"])
@@
-1069,6
+1069,11
@@
def new_vnfd_v3(mydb, tenant_id, vnf_descriptor):
devices.append(device)
devices.append(device)
+ if not db_vm.get("image_id"):
+ if not db_vm["pdu_type"]:
+ raise NfvoException("Not defined image for VDU")
+ # create a fake image
+
# cloud-init
boot_data = {}
if vdu.get("cloud-init"):
# cloud-init
boot_data = {}
if vdu.get("cloud-init"):
@@
-3253,7
+3258,7
@@
def create_instance(mydb, tenant_id, instance_dict):
lookfor_network = True
lookfor_filter["name"] = sce_net.get("vim_network_name")
elif sce_net["external"]:
lookfor_network = True
lookfor_filter["name"] = sce_net.get("vim_network_name")
elif sce_net["external"]:
- if sce_net
['vim_id'] is not None
:
+ if sce_net
.get('vim_id')
:
# there is a netmap at datacenter_nets database # TODO REVISE!!!!
create_network = False
lookfor_network = True
# there is a netmap at datacenter_nets database # TODO REVISE!!!!
create_network = False
lookfor_network = True