X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=nfvo_db.py;h=11ae450a000e83b201c7e4d2f4b695013af24703;hb=f70d0961a1266d6c4a0a4ce0aab18a5b9c8721ef;hp=5e51c3b1101693050041459ca424306d9aa36879;hpb=2a1fc4e770c0688ac1fcb41e1c62bf36a2719d28;p=osm%2FRO.git diff --git a/nfvo_db.py b/nfvo_db.py index 5e51c3b1..11ae450a 100644 --- a/nfvo_db.py +++ b/nfvo_db.py @@ -652,7 +652,7 @@ class nfvo_db(db_base.db_base): self.cur.execute(cmd) vnf['interfaces'] = self.cur.fetchall() #vms - cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, vms.name as name, vms.description as description " \ + cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, vms.name as name, vms.description as description, vms.boot_data as boot_data " \ " FROM vnfs join vms on vnfs.uuid=vms.vnf_id " \ " WHERE vnfs.uuid='" + vnf['vnf_id'] +"'" \ " ORDER BY vms.created_at" @@ -660,6 +660,10 @@ class nfvo_db(db_base.db_base): self.cur.execute(cmd) vnf['vms'] = self.cur.fetchall() for vm in vnf['vms']: + if vm["boot_data"]: + vm["boot_data"] = yaml.safe_load(vm["boot_data"]) + else: + del vm["boot_data"] if datacenter_id!=None: cmd = "SELECT vim_id FROM datacenters_images WHERE image_id='{}' AND datacenter_id='{}'".format(vm['image_id'],datacenter_id) self.logger.debug(cmd)