X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=osm_ro%2Fnfvo_db.py;h=71ccfbf7915d07fd83381d7cb8387d769a7a1b6c;hp=80697a3d2859fac39973adbbaf41b55f786229dc;hb=16e3dd4ed7547fe4a4273c53a6deb23c00fdbfb3;hpb=fda3b8c9084db17a03feba4e989ce43124e261e1 diff --git a/osm_ro/nfvo_db.py b/osm_ro/nfvo_db.py index 80697a3d..71ccfbf7 100644 --- a/osm_ro/nfvo_db.py +++ b/osm_ro/nfvo_db.py @@ -606,7 +606,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," \ + cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, image_list, vms.name as name," \ " vms.description as description, vms.boot_data as boot_data, count," \ " vms.availability_zone as availability_zone" \ " FROM vnfs join vms on vnfs.uuid=vms.vnf_id" \ @@ -620,6 +620,10 @@ class nfvo_db(db_base.db_base): vm["boot_data"] = yaml.safe_load(vm["boot_data"]) else: del vm["boot_data"] + if vm["image_list"]: + vm["image_list"] = yaml.safe_load(vm["image_list"]) + else: + del vm["image_list"] if datacenter_vim_id!=None: cmd = "SELECT vim_id FROM datacenters_images WHERE image_id='{}' AND datacenter_vim_id='{}'".format(vm['image_id'],datacenter_vim_id) self.logger.debug(cmd)