if scenario_dict["cloud_config"]:
scenario_dict["cloud-config"] = yaml.load(scenario_dict["cloud_config"])
del scenario_dict["cloud_config"]
- #sce_vnfs
+ # sce_vnfs
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)
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" \
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)
raise db_base.db_base_Exception("More than one ip-profile found with this criteria: net_id='{}'".format(vnf_net['uuid']), db_base.HTTP_Bad_Request)
#sce_nets
- cmd = "SELECT uuid,name,type,external,description" \
+ cmd = "SELECT uuid,name,type,external,description,vim_network_name" \
" FROM sce_nets WHERE scenario_id='{}'" \
" ORDER BY created_at ".format(scenario_dict['uuid'])
self.logger.debug(cmd)
self.cur.execute(cmd)
rows = self.cur.fetchall()
if self.cur.rowcount==0:
- raise db_base.db_base_Exception("No scenario found where " + where_text, db_base.HTTP_Bad_Request)
+ raise db_base.db_base_Exception("No scenario found where " + where_text, db_base.HTTP_Not_Found)
elif self.cur.rowcount>1:
- raise db_base.db_base_Exception("More than one scenario found where " + where_text, db_base.HTTP_Bad_Request)
+ raise db_base.db_base_Exception("More than one scenario found where " + where_text, db_base.HTTP_Conflict)
scenario_uuid = rows[0]["uuid"]
scenario_name = rows[0]["name"]
def new_rows(self, tables, uuid_list=None):
"""
- Make a transactional insertion of rows at several tables
+ Make a transactional insertion of rows at several tables. Can be also a deletion
:param tables: list with dictionary where the keys are the table names and the values are a row or row list
with the values to be inserted at the table. Each row is a dictionary with the key values. E.g.:
tables = [
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
+ If dict contains {"TO-DELETE": uuid} the entry is deleted if exist instead of inserted
: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
"""
if isinstance(row_list, dict):
row_list = (row_list, ) #create a list with the single value
for row in row_list:
+ if "TO-DELETE" in row:
+ self._delete_row_by_id_internal(table_name, row["TO-DELETE"])
+ continue
+
if table_name in self.tables_with_created_field:
if "created_at" in row:
- created_time_param = created_time + row.pop("created_at")*0.00001
+ created_time_param = created_time + (index + row.pop("created_at"))*0.00001
else:
created_time_param = created_time + index*0.00001
- index += 1
+ index += 1
else:
created_time_param = 0
self._new_row_internal(table_name, row, add_uuid=False, root_uuid=None,
cmd = "SELECT inst.uuid as uuid, inst.name as name, inst.scenario_id as scenario_id, datacenter_id"\
" ,datacenter_tenant_id, s.name as scenario_name,inst.tenant_id as tenant_id" \
" ,inst.description as description, inst.created_at as created_at" \
- " ,inst.cloud_config as cloud_config" \
+ " ,inst.cloud_config as cloud_config, s.osm_id as nsd_osm_id" \
" FROM instance_scenarios as inst left join scenarios as s on inst.scenario_id=s.uuid" \
" WHERE " + where_text
self.logger.debug(cmd)
# instance_vnfs
cmd = "SELECT iv.uuid as uuid, iv.vnf_id as vnf_id, sv.name as vnf_name, sce_vnf_id, datacenter_id"\
- " ,datacenter_tenant_id, v.mgmt_access, sv.member_vnf_index "\
+ " ,datacenter_tenant_id, v.mgmt_access, sv.member_vnf_index, v.osm_id as vnfd_osm_id "\
" FROM instance_vnfs as iv left join sce_vnfs as sv "\
"on iv.sce_vnf_id=sv.uuid join vnfs as v on iv.vnf_id=v.uuid" \
" WHERE iv.instance_scenario_id='{}'" \
for vnf in instance_dict['vnfs']:
vnf_manage_iface_list=[]
#instance vms
- cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as created_at, name"\
+ cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as "\
+ "created_at, name, vms.osm_id as vdu_osm_id, vim_name"\
" FROM instance_vms as iv join vms on iv.vm_id=vms.uuid "\
" WHERE instance_vnf_id='{}' ORDER BY iv.created_at".format(vnf['uuid'])
self.logger.debug(cmd)
projects / osm / RO.git / blobdiff