tables_with_createdat_field=["datacenters","instance_nets","instance_scenarios","instance_vms","instance_vnfs",
"interfaces","nets","nfvo_tenants","scenarios","sce_interfaces","sce_nets",
- "sce_vnfs","tenants_datacenters","datacenter_tenants","vms","vnfs", "datacenter_nets"]
+ "sce_vnfs","tenants_datacenters","datacenter_tenants","vms","vnfs", "datacenter_nets",
+ "instance_actions", "vim_actions"]
class nfvo_db(db_base.db_base):
# print "nfvo_db.get_instance_scenario DB Exception %d: %s" % (e.args[0], e.args[1])
# return self._format_error(e)
- def get_scenario(self, scenario_id, tenant_id=None, datacenter_id=None):
+ def get_scenario(self, scenario_id, tenant_id=None, datacenter_vim_id=None, datacenter_id=None):
'''Obtain the scenario information, filtering by one or serveral of the tenant, uuid or name
scenario_id is the uuid or the name if it is not a valid uuid format
- if datacenter_id is provided, it supply aditional vim_id fields with the matching vim uuid
+ if datacenter_vim_id,d datacenter_id is provided, it supply aditional vim_id fields with the matching vim uuid
Only one scenario must mutch the filtering or an error is returned
'''
tries = 2
scenario_dict["cloud-config"] = yaml.load(scenario_dict["cloud_config"])
del scenario_dict["cloud_config"]
#sce_vnfs
- cmd = "SELECT uuid,name,vnf_id,description FROM sce_vnfs WHERE scenario_id='{}' ORDER BY created_at".format(scenario_dict['uuid'])
+ cmd = "SELECT uuid,name,member_vnf_index,vnf_id,description FROM sce_vnfs WHERE scenario_id='{}' "\
+ "ORDER BY created_at".format(scenario_dict['uuid'])
self.logger.debug(cmd)
self.cur.execute(cmd)
scenario_dict['vnfs'] = self.cur.fetchall()
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)
+ 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)
self.cur.execute(cmd)
if self.cur.rowcount==1:
vim_image_dict = self.cur.fetchone()
vm['vim_image_id']=vim_image_dict['vim_id']
- cmd = "SELECT vim_id FROM datacenters_flavors WHERE flavor_id='{}' AND datacenter_id='{}'".format(vm['flavor_id'],datacenter_id)
+ cmd = "SELECT vim_id FROM datacenters_flavors WHERE flavor_id='{}' AND datacenter_vim_id='{}'".format(vm['flavor_id'],datacenter_vim_id)
self.logger.debug(cmd)
self.cur.execute(cmd)
if self.cur.rowcount==1:
self.logger.debug(cmd)
self.cur.execute(cmd)
d_net = self.cur.fetchone()
- if d_net==None or datacenter_id==None:
+ if d_net==None or datacenter_vim_id==None:
#print "nfvo_db.get_scenario() WARNING external net %s not found" % net['name']
net['vim_id']=None
else:
{"table2": [ {"column1": value, "column2: value, ... }, {"column1": value, "column2: value, ... }, ...],
{"table3": {"column1": value, "column2: value, ... }
}
+ If tables does not contain the 'created_at', it is generated incrementally with the order of tables. You can
+ provide a integer value, that it is an index multiply by 0.00001 to add to the created time to manually set
+ up and order
:param uuid_list: list of created uuids, first one is the root (#TODO to store at uuid table)
:return: None if success, raise exception otherwise
"""
row_list = (row_list, ) #create a list with the single value
for row in row_list:
if table_name in self.tables_with_created_field:
- created_time_param = created_time + index*0.00001
+ if "created_at" in row:
+ created_time_param = created_time + row.pop("created_at")*0.00001
+ else:
+ created_time_param = created_time + index*0.00001
+ index += 1
else:
- created_time_param=0
+ created_time_param = 0
self._new_row_internal(table_name, row, add_uuid=False, root_uuid=None,
created_time=created_time_param)
- index += 1
return
except (mdb.Error, AttributeError) as e:
self._format_error(e, tries)
try:
with self.con:
self.cur = self.con.cursor(mdb.cursors.DictCursor)
- #instance table
+ # instance table
where_list=[]
if tenant_id is not None: where_list.append( "inst.tenant_id='" + tenant_id +"'" )
if db_base._check_valid_uuid(instance_id):
instance_dict["cloud-config"] = yaml.load(instance_dict["cloud_config"])
del instance_dict["cloud_config"]
- #instance_vnfs
+ # instance_vnfs
cmd = "SELECT iv.uuid as uuid,sv.vnf_id as vnf_id,sv.name as vnf_name, sce_vnf_id, datacenter_id, datacenter_tenant_id"\
" FROM instance_vnfs as iv join sce_vnfs as sv on iv.sce_vnf_id=sv.uuid" \
" WHERE iv.instance_scenario_id='{}'" \
projects / osm / RO.git / blobdiff