X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=nfvo_db.py;h=1fa5d7232e66fbd834249b51497097ac339c2a92;hb=ed1be4b1591c258748261f21947dc388c28c6fd9;hp=1bf3e4bc79951028d6c81b97093910ab2a294089;hpb=392f28583d8750e7e2c2c5f2341688ec5acdf824;p=osm%2FRO.git diff --git a/nfvo_db.py b/nfvo_db.py index 1bf3e4bc..1fa5d723 100644 --- a/nfvo_db.py +++ b/nfvo_db.py @@ -27,542 +27,27 @@ NFVO DB engine. It implements all the methods to interact with the Openmano Data __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ ="$28-aug-2014 10:05:01$" +import db_base import MySQLdb as mdb -import uuid as myUuid -from utils import auxiliary_functions as af import json import yaml import time +#import sys, os -HTTP_Bad_Request = 400 -HTTP_Unauthorized = 401 -HTTP_Not_Found = 404 -HTTP_Method_Not_Allowed = 405 -HTTP_Request_Timeout = 408 -HTTP_Conflict = 409 -HTTP_Service_Unavailable = 503 -HTTP_Internal_Server_Error = 500 - -tables_with_created_field=["datacenters","instance_nets","instance_scenarios","instance_vms","instance_vnfs", +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"] + "sce_vnfs","tenants_datacenters","datacenter_tenants","vms","vnfs", "datacenter_nets"] -class nfvo_db(): - def __init__(self): - #initialization +class nfvo_db(db_base.db_base): + def __init__(self, host=None, user=None, passwd=None, database=None, log_name='openmano.db', log_level=None): + db_base.db_base.__init__(self, host, user, passwd, database, log_name, log_level) + db_base.db_base.tables_with_created_field=tables_with_createdat_field return - def connect(self, host=None, user=None, passwd=None, database=None): - '''Connect to specific data base. - The first time a valid host, user, passwd and database must be provided, - Following calls can skip this parameters - ''' - try: - if host is not None: self.host = host - if user is not None: self.user = user - if passwd is not None: self.passwd = passwd - if database is not None: self.database = database - - self.con = mdb.connect(self.host, self.user, self.passwd, self.database) - print "DB: connected to %s@%s -> %s" % (self.user, self.host, self.database) - return 0 - except mdb.Error, e: - print "nfvo_db.connect Error connecting to DB %s@%s -> %s Error %d: %s" % (self.user, self.host, self.database, e.args[0], e.args[1]) - return -1 - - def get_db_version(self): - ''' Obtain the database schema version. - Return: (negative, text) if error or version 0.0 where schema_version table is missing - (version_int, version_text) if ok - ''' - cmd = "SELECT version_int,version,openmano_ver FROM schema_version" - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor() - #print cmd - self.cur.execute(cmd) - rows = self.cur.fetchall() - highest_version_int=0 - highest_version="" - #print rows - for row in rows: #look for the latest version - if row[0]>highest_version_int: - highest_version_int, highest_version = row[0:2] - return highest_version_int, highest_version - except (mdb.Error, AttributeError), e: - #print cmd - print "get_db_version DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def disconnect(self): - '''disconnect from specific data base''' - try: - self.con.close() - del self.con - except mdb.Error, e: - print "Error disconnecting from DB: Error %d: %s" % (e.args[0], e.args[1]) - return -1 - except AttributeError, e: #self.con not defined - if e[0][-5:] == "'con'": return -1, "Database internal error, no connection." - else: raise - - def format_error(self, e, command=None, extra=None): - if type(e[0]) is str: - if e[0][-5:] == "'con'": return -HTTP_Internal_Server_Error, "DB Exception, no connection." - else: raise - if e.args[0]==2006 or e.args[0]==2013 : #MySQL server has gone away (((or))) Exception 2013: Lost connection to MySQL server during query - #reconnect - self.connect() - return -HTTP_Request_Timeout,"Database reconnection. Try Again" - - fk=e.args[1].find("foreign key constraint fails") - if fk>=0: - if command=="update": return -HTTP_Bad_Request, "tenant_id %s not found." % extra - elif command=="delete": return -HTTP_Bad_Request, "Resource is not free. There are %s that prevent deleting it." % extra - de = e.args[1].find("Duplicate entry") - fk = e.args[1].find("for key") - uk = e.args[1].find("Unknown column") - wc = e.args[1].find("in 'where clause'") - fl = e.args[1].find("in 'field list'") - #print de, fk, uk, wc,fl - if de>=0: - if fk>=0: #error 1062 - return -HTTP_Conflict, "Value %s already in use for %s" % (e.args[1][de+15:fk], e.args[1][fk+7:]) - if uk>=0: - if wc>=0: - return -HTTP_Bad_Request, "Field %s can not be used for filtering" % e.args[1][uk+14:wc] - if fl>=0: - return -HTTP_Bad_Request, "Field %s does not exist" % e.args[1][uk+14:wc] - return -HTTP_Internal_Server_Error, "Database internal Error %d: %s" % (e.args[0], e.args[1]) - - def __str2db_format(self, data): - '''Convert string data to database format. - If data is None it returns the 'Null' text, - otherwise it returns the text surrounded by quotes ensuring internal quotes are escaped. - ''' - if data==None: - return 'Null' - out=str(data) - if "'" not in out: - return "'" + out + "'" - elif '"' not in out: - return '"' + out + '"' - else: - return json.dumps(out) - - def __tuple2db_format_set(self, data): - '''Compose the needed text for a SQL SET, parameter 'data' is a pair tuple (A,B), - and it returns the text 'A="B"', where A is a field of a table and B is the value - If B is None it returns the 'A=Null' text, without surrounding Null by quotes - If B is not None it returns the text "A='B'" or 'A="B"' where B is surrounded by quotes, - and it ensures internal quotes of B are escaped. - ''' - if data[1]==None: - return str(data[0]) + "=Null" - out=str(data[1]) - if "'" not in out: - return str(data[0]) + "='" + out + "'" - elif '"' not in out: - return str(data[0]) + '="' + out + '"' - else: - return str(data[0]) + '=' + json.dumps(out) - - def __tuple2db_format_where(self, data): - '''Compose the needed text for a SQL WHERE, parameter 'data' is a pair tuple (A,B), - and it returns the text 'A="B"', where A is a field of a table and B is the value - If B is None it returns the 'A is Null' text, without surrounding Null by quotes - If B is not None it returns the text "A='B'" or 'A="B"' where B is surrounded by quotes, - and it ensures internal quotes of B are escaped. - ''' - if data[1]==None: - return str(data[0]) + " is Null" - -# if type(data[1]) is tuple: #this can only happen in a WHERE_OR clause -# text =[] -# for d in data[1]: -# if d==None: -# text.append(str(data[0]) + " is Null") -# continue -# out=str(d) -# if "'" not in out: -# text.append( str(data[0]) + "='" + out + "'" ) -# elif '"' not in out: -# text.append( str(data[0]) + '="' + out + '"' ) -# else: -# text.append( str(data[0]) + '=' + json.dumps(out) ) -# return " OR ".join(text) - - out=str(data[1]) - if "'" not in out: - return str(data[0]) + "='" + out + "'" - elif '"' not in out: - return str(data[0]) + '="' + out + '"' - else: - return str(data[0]) + '=' + json.dumps(out) - - def __tuple2db_format_where_not(self, data): - '''Compose the needed text for a SQL WHERE(not). parameter 'data' is a pair tuple (A,B), - and it returns the text 'A<>"B"', where A is a field of a table and B is the value - If B is None it returns the 'A is not Null' text, without surrounding Null by quotes - If B is not None it returns the text "A<>'B'" or 'A<>"B"' where B is surrounded by quotes, - and it ensures internal quotes of B are escaped. - ''' - if data[1]==None: - return str(data[0]) + " is not Null" - out=str(data[1]) - if "'" not in out: - return str(data[0]) + "<>'" + out + "'" - elif '"' not in out: - return str(data[0]) + '<>"' + out + '"' - else: - return str(data[0]) + '<>' + json.dumps(out) - - def __remove_quotes(self, data): - '''remove single quotes ' of any string content of data dictionary''' - for k,v in data.items(): - if type(v) == str: - if "'" in v: - data[k] = data[k].replace("'","_") - - def __update_rows(self, table, UPDATE, WHERE, log=False, modified_time=0): - ''' Update one or several rows into a table. - Atributes - UPDATE: dictionary with the key: value to change - table: table where to update - WHERE: dictionary of elements to update - Return: (result, descriptive text) where result indicates the number of updated files, negative if error - ''' - #gettting uuid - uuid = WHERE['uuid'] if 'uuid' in WHERE else None - values = ",".join(map(self.__tuple2db_format_set, UPDATE.iteritems() )) - if modified_time: - values += ",modified_at=%f" % modified_time - cmd= "UPDATE " + table +" SET " + values +\ - " WHERE " + " and ".join(map(self.__tuple2db_format_where, WHERE.iteritems() )) - print cmd - self.cur.execute(cmd) - nb_rows = self.cur.rowcount - if nb_rows > 0 and log: - #inserting new log - if uuid is None: uuid_k = uuid_v = "" - else: uuid_k=",uuid"; uuid_v=",'" + str(uuid) + "'" - cmd = "INSERT INTO logs (related,level%s,description) VALUES ('%s','debug'%s,\"updating %d entry %s\")" \ - % (uuid_k, table, uuid_v, nb_rows, (str(UPDATE)).replace('"','-') ) - print cmd - self.cur.execute(cmd) - return nb_rows, "%d updated from %s" % (nb_rows, table[:-1] ) - - def _new_row_internal(self, table, INSERT, tenant_id=None, add_uuid=False, root_uuid=None, log=False, created_time=0): - ''' Add one row into a table. It DOES NOT begin or end the transaction, so self.con.cursor must be created - Attribute - INSERT: dictionary with the key: value to insert - table: table where to insert - tenant_id: only useful for logs. If provided, logs will use this tenant_id - add_uuid: if True, it will create an uuid key entry at INSERT if not provided - It checks presence of uuid and add one automatically otherwise - Return: (result, uuid) where result can be 0 if error, or 1 if ok - ''' - - if add_uuid: - #create uuid if not provided - if 'uuid' not in INSERT: - uuid = INSERT['uuid'] = str(myUuid.uuid1()) # create_uuid - else: - uuid = str(INSERT['uuid']) - else: - uuid=None - if add_uuid: - #defining root_uuid if not provided - if root_uuid is None: - root_uuid = uuid - if created_time: - created_at = created_time - else: - created_at=time.time() - #inserting new uuid - cmd = "INSERT INTO uuids (uuid, root_uuid, used_at, created_at) VALUES ('%s','%s','%s', %f)" % (uuid, root_uuid, table, created_at) - print cmd - self.cur.execute(cmd) - #insertion - cmd= "INSERT INTO " + table +" SET " + \ - ",".join(map(self.__tuple2db_format_set, INSERT.iteritems() )) - if created_time: - cmd += ",created_at=%f" % created_time - print cmd - self.cur.execute(cmd) - nb_rows = self.cur.rowcount - #inserting new log - if nb_rows > 0 and log: - if add_uuid: del INSERT['uuid'] - if uuid is None: uuid_k = uuid_v = "" - else: uuid_k=",uuid"; uuid_v=",'" + str(uuid) + "'" - if tenant_id is None: tenant_k = tenant_v = "" - else: tenant_k=",nfvo_tenant_id"; tenant_v=",'" + str(tenant_id) + "'" - cmd = "INSERT INTO logs (related,level%s%s,description) VALUES ('%s','debug'%s%s,\"new %s %s\")" \ - % (uuid_k, tenant_k, table, uuid_v, tenant_v, table[:-1], str(INSERT).replace('"','-')) - print cmd - self.cur.execute(cmd) - return nb_rows, uuid - - def __get_rows(self,table,uuid): - self.cur.execute("SELECT * FROM " + str(table) +" where uuid='" + str(uuid) + "'") - rows = self.cur.fetchall() - return self.cur.rowcount, rows - - def new_row(self, table, INSERT, tenant_id=None, add_uuid=False, log=False, created_time=0): - ''' Add one row into a table. - Attribute - INSERT: dictionary with the key: value to insert - table: table where to insert - tenant_id: only useful for logs. If provided, logs will use this tenant_id - add_uuid: if True, it will create an uuid key entry at INSERT if not provided - It checks presence of uuid and add one automatically otherwise - Return: (result, uuid) where result can be 0 if error, or 1 if ok - ''' - if table in tables_with_created_field and created_time==0: - created_time=time.time() - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor() - return self._new_row_internal(table, INSERT, tenant_id, add_uuid, None, log, created_time) - - except (mdb.Error, AttributeError), e: - print "nfvo_db.new_row DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def update_rows(self, table, UPDATE, WHERE, log=False, modified_time=0): - ''' Update one or several rows into a table. - Atributes - UPDATE: dictionary with the key: value to change - table: table where to update - WHERE: dictionary of elements to update - Return: (result, descriptive text) where result indicates the number of updated files - ''' - if table in tables_with_created_field and modified_time==0: - modified_time=time.time() - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor() - return self.__update_rows(table, UPDATE, WHERE, log) - - except (mdb.Error, AttributeError), e: - print "nfvo_db.update_rows DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def delete_row(self, table, uuid, tenant_id=None, log=True): - for retry_ in range(0,2): - try: - with self.con: - #delete host - self.cur = self.con.cursor() - cmd = "DELETE FROM %s WHERE uuid = '%s'" % (table, uuid) - print cmd - self.cur.execute(cmd) - deleted = self.cur.rowcount - if deleted == 1: - #delete uuid - if table == 'tenants': tenant_str=uuid - elif tenant_id: - tenant_str = tenant_id - else: - tenant_str = 'Null' - self.cur = self.con.cursor() - cmd = "DELETE FROM uuids WHERE root_uuid = '%s'" % uuid - print cmd - self.cur.execute(cmd) - #inserting new log - if log: - cmd = "INSERT INTO logs (related,level,uuid,nfvo_tenant_id,description) VALUES ('%s','debug','%s','%s','delete %s')" % (table, uuid, tenant_str, table[:-1]) - print cmd - self.cur.execute(cmd) - return deleted, table[:-1] + " '%s' %s" %(uuid, "deleted" if deleted==1 else "not found") - except (mdb.Error, AttributeError), e: - print "nfvo_db.delete_row DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e, "delete", 'instances' if table=='hosts' or table=='tenants' else 'dependencies') - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def delete_row_by_dict(self, **sql_dict): - ''' Deletes rows from a table. - Attribute sql_dir: dictionary with the following key: value - 'FROM': string of table name (Mandatory) - 'WHERE': dict of key:values, translated to key=value AND ... (Optional) - 'WHERE_NOT': dict of key:values, translated to key<>value AND ... (Optional) - 'LIMIT': limit of number of rows (Optional) - Return: the (number of items deleted, descriptive test) if ok; (negative, descriptive text) if error - ''' - #print sql_dict - from_ = "FROM " + str(sql_dict['FROM']) - #print 'from_', from_ - if 'WHERE' in sql_dict and len(sql_dict['WHERE']) > 0: - w=sql_dict['WHERE'] - where_ = "WHERE " + " AND ".join(map(self.__tuple2db_format_where, w.iteritems())) - else: where_ = "" - if 'WHERE_NOT' in sql_dict and len(sql_dict['WHERE_NOT']) > 0: - w=sql_dict['WHERE_NOT'] - where_2 = " AND ".join(map(self.__tuple2db_format_where_not, w.iteritems())) - if len(where_)==0: where_ = "WHERE " + where_2 - else: where_ = where_ + " AND " + where_2 - #print 'where_', where_ - limit_ = "LIMIT " + str(sql_dict['LIMIT']) if 'LIMIT' in sql_dict else "" - #print 'limit_', limit_ - cmd = " ".join( ("DELETE", from_, where_, limit_) ) - print cmd - for retry_ in range(0,2): - try: - with self.con: - #delete host - self.cur = self.con.cursor() - self.cur.execute(cmd) - deleted = self.cur.rowcount - return deleted, "%d deleted from %s" % (deleted, sql_dict['FROM'][:-1] ) - except (mdb.Error, AttributeError), e: - print "nfvo_db.delete_row DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e, "delete", 'dependencies') - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def get_rows(self,table,uuid): - '''get row from a table based on uuid''' - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - self.cur.execute("SELECT * FROM " + str(table) +" where uuid='" + str(uuid) + "'") - rows = self.cur.fetchall() - return self.cur.rowcount, rows - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_rows DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def get_table(self, **sql_dict): - ''' Obtain rows from a table. - Attribute sql_dir: dictionary with the following key: value - 'SELECT': list or tuple of fields to retrieve) (by default all) - 'FROM': string of table name (Mandatory) - 'WHERE': dict of key:values, translated to key=value (key is null) AND ... (Optional) - 'WHERE_NOT': dict of key:values, translated to key<>value (key is not null) AND ... (Optional) - 'WHERE_OR': dict of key:values, translated to key=value OR ... (Optional) - 'WHERE_AND_OR: str 'AND' or 'OR'(by default) mark the priority to 'WHERE AND (WHERE_OR)' or (WHERE) OR WHERE_OR' (Optional - 'LIMIT': limit of number of rows (Optional) - 'ORDER_BY': list or tuple of fields to order - Return: a list with dictionaries at each row - ''' - #print sql_dict - select_= "SELECT " + ("*" if 'SELECT' not in sql_dict else ",".join(map(str,sql_dict['SELECT'])) ) - #print 'select_', select_ - from_ = "FROM " + str(sql_dict['FROM']) - #print 'from_', from_ - where_and = "" - where_or = "" - w=sql_dict.get('WHERE') - if w: - where_and = " AND ".join(map(self.__tuple2db_format_where, w.iteritems() )) - w=sql_dict.get('WHERE_NOT') - if w: - if where_and: where_and += " AND " - where_and += " AND ".join(map(self.__tuple2db_format_where_not, w.iteritems() ) ) - w=sql_dict.get('WHERE_OR') - if w: - where_or = " OR ".join(map(self.__tuple2db_format_where, w.iteritems() )) - if where_and and where_or: - if sql_dict.get("WHERE_AND_OR") == "AND": - where_ = "WHERE " + where_and + " AND (" + where_or + ")" - else: - where_ = "WHERE (" + where_and + ") OR " + where_or - elif where_and and not where_or: - where_ = "WHERE " + where_and - elif not where_and and where_or: - where_ = "WHERE " + where_or - else: - where_ = "" - #print 'where_', where_ - limit_ = "LIMIT " + str(sql_dict['LIMIT']) if 'LIMIT' in sql_dict else "" - order_ = "ORDER BY " + ",".join(map(str,sql_dict['SELECT'])) if 'ORDER_BY' in sql_dict else "" - - #print 'limit_', limit_ - cmd = " ".join( (select_, from_, where_, limit_, order_) ) - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - print cmd - self.cur.execute(cmd) - rows = self.cur.fetchall() - return self.cur.rowcount, rows - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_table DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def get_table_by_uuid_name(self, table, uuid_name, error_item_text=None, allow_serveral=False, WHERE_OR={}, WHERE_AND_OR="OR"): - ''' Obtain One row from a table based on name or uuid. - Attribute: - table: string of table name - uuid_name: name or uuid. If not uuid format is found, it is considered a name - allow_severeral: if False return ERROR if more than one row are founded - error_item_text: in case of error it identifies the 'item' name for a proper output text - 'WHERE_OR': dict of key:values, translated to key=value OR ... (Optional) - 'WHERE_AND_OR: str 'AND' or 'OR'(by default) mark the priority to 'WHERE AND (WHERE_OR)' or (WHERE) OR WHERE_OR' (Optional - Return: if allow_several==False, a dictionary with this row, or error if no item is found or more than one is found - if allow_several==True, a list of dictionaries with the row or rows, error if no item is found - ''' - - if error_item_text==None: - error_item_text = table - what = 'uuid' if af.check_valid_uuid(uuid_name) else 'name' - cmd = " SELECT * FROM %s WHERE %s='%s'" % (table, what, uuid_name) - if WHERE_OR: - where_or = " OR ".join(map(self.__tuple2db_format_where, WHERE_OR.iteritems() )) - if WHERE_AND_OR == "AND": - cmd += " AND (" + where_or + ")" - else: - cmd += " OR " + where_or - - - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - print cmd - self.cur.execute(cmd) - number = self.cur.rowcount - if number==0: - return -HTTP_Not_Found, "No %s found with %s '%s'" %(error_item_text, what, uuid_name) - elif number>1 and not allow_serveral: - return -HTTP_Bad_Request, "More than one %s found with %s '%s'" %(error_item_text, what, uuid_name) - if allow_serveral: - rows = self.cur.fetchall() - else: - rows = self.cur.fetchone() - return number, rows - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_table_by_uuid_name DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def get_uuid(self, uuid): - '''check in the database if this uuid is already present''' - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - self.cur.execute("SELECT * FROM uuids where uuid='" + str(uuid) + "'") - rows = self.cur.fetchall() - return self.cur.rowcount, rows - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_uuid DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - def new_vnf_as_a_whole(self,nfvo_tenant,vnf_name,vnf_descriptor,VNFCDict): - print "Adding new vnf to the NFVO database" - for retry_ in range(0,2): + self.logger.debug("Adding new vnf to the NFVO database") + tries = 2 + while tries: created_time = time.time() try: with self.con: @@ -575,27 +60,19 @@ class nfvo_db(): myVNFDict["class"] = vnf_descriptor['vnf'].get('class',"MISC") myVNFDict["tenant_id"] = vnf_descriptor['vnf'].get("tenant_id") - result, vnf_id = self._new_vnf(myVNFDict,nfvo_tenant,created_time) - if result < 0: - return result, "Error creating vnf in NFVO database: %s" %vnf_id - - print "VNF %s added to NFVO DB. VNF id: %s" % (vnf_name,vnf_id) - - print "Adding new vms to the NFVO database" + vnf_id = self._new_row_internal('vnfs', myVNFDict, add_uuid=True, root_uuid=None, created_time=created_time) + #print "Adding new vms to the NFVO database" #For each vm, we must create the appropriate vm in the NFVO database. vmDict = {} for _,vm in VNFCDict.iteritems(): #This code could make the name of the vms grow and grow. #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name #vm['name'] = "%s-%s" % (vnf_name,vm['name']) - print "VM name: %s. Description: %s" % (vm['name'], vm['description']) + #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) vm["vnf_id"] = vnf_id created_time += 0.00001 - result, vm_id = self._new_vm(vm,nfvo_tenant,vnf_id,created_time) - if result < 0: - return result, "Error creating vm in NFVO database: %s" %vm_id - - print "Internal vm id in NFVO DB: %s" % vm_id + vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Internal vm id in NFVO DB: %s" % vm_id vmDict[vm['name']] = vm_id #Collect the data interfaces of each VM/VNFC under the 'numas' field @@ -604,7 +81,7 @@ class nfvo_db(): dataifacesDict[vm['name']] = {} for numa in vm.get('numas', []): for dataiface in numa.get('interfaces',[]): - af.convert_bandwidth(dataiface) + db_base._convert_bandwidth(dataiface) dataifacesDict[vm['name']][dataiface['name']] = {} dataifacesDict[vm['name']][dataiface['name']]['vpci'] = dataiface['vpci'] dataifacesDict[vm['name']][dataiface['name']]['bw'] = dataiface['bandwidth'] @@ -616,7 +93,7 @@ class nfvo_db(): if 'bridge-ifaces' in vm: bridgeInterfacesDict[vm['name']] = {} for bridgeiface in vm['bridge-ifaces']: - af.convert_bandwidth(bridgeiface) + db_base._convert_bandwidth(bridgeiface) bridgeInterfacesDict[vm['name']][bridgeiface['name']] = {} bridgeInterfacesDict[vm['name']][bridgeiface['name']]['vpci'] = bridgeiface.get('vpci',None) bridgeInterfacesDict[vm['name']][bridgeiface['name']]['mac'] = bridgeiface.get('mac_address',None) @@ -624,12 +101,11 @@ class nfvo_db(): bridgeInterfacesDict[vm['name']][bridgeiface['name']]['model'] = bridgeiface.get('model', None) #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. - print "Adding new nets (VNF internal nets) to the NFVO database (if any)" + #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" internalconnList = [] if 'internal-connections' in vnf_descriptor['vnf']: for net in vnf_descriptor['vnf']['internal-connections']: - print "CODE TO BE CHECKED" - print "Net name: %s. Description: %s" % (net['name'], net['description']) + #print "Net name: %s. Description: %s" % (net['name'], net['description']) myNetDict = {} myNetDict["name"] = net['name'] @@ -638,9 +114,7 @@ class nfvo_db(): myNetDict["vnf_id"] = vnf_id created_time += 0.00001 - result, net_id = self._new_net(myNetDict,nfvo_tenant,vnf_id, created_time) - if result < 0: - return result, "Error creating net in NFVO database: %s" %net_id + net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) for element in net['elements']: ifaceItem = {} @@ -660,19 +134,16 @@ class nfvo_db(): ifaceItem["bw"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['bw'] ifaceItem["model"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['model'] internalconnList.append(ifaceItem) - - print "Internal net id in NFVO DB: %s" % net_id + #print "Internal net id in NFVO DB: %s" % net_id - print "Adding internal interfaces to the NFVO database (if any)" + #print "Adding internal interfaces to the NFVO database (if any)" for iface in internalconnList: print "Iface name: %s" % iface['internal_name'] created_time += 0.00001 - result, iface_id = self._new_interface(iface,nfvo_tenant,vnf_id,created_time) - if result < 0: - return result, "Error creating iface in NFVO database: %s" %iface_id - print "Iface id in NFVO DB: %s" % iface_id + iface_id = self._new_row_internal('interfaces', iface, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Iface id in NFVO DB: %s" % iface_id - print "Adding external interfaces to the NFVO database" + #print "Adding external interfaces to the NFVO database" for iface in vnf_descriptor['vnf']['external-connections']: myIfaceDict = {} #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) @@ -692,37 +163,177 @@ class nfvo_db(): myIfaceDict["mac"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['mac'] print "Iface name: %s" % iface['name'] created_time += 0.00001 - result, iface_id = self._new_interface(myIfaceDict,nfvo_tenant,vnf_id,created_time) - if result < 0: - return result, "Error creating iface in NFVO database: %s" %iface_id - print "Iface id in NFVO DB: %s" % iface_id + iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Iface id in NFVO DB: %s" % iface_id - return 1,vnf_id + return vnf_id - except (mdb.Error, AttributeError), e: - print "new_vnf_as_a_whole DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 - def _new_vnf(self, vnf_dict, tenant_id, created_time=0): - #return self.new_row('vnfs', vnf_dict, None, tenant_id, True, True) - return self._new_row_internal('vnfs', vnf_dict, tenant_id, add_uuid=True, root_uuid=None, log=True, created_time=created_time) - - def _new_vm(self, vm_dict, tenant_id, vnf_id = None, created_time=0): - #return self.new_row('vms', vm_dict, tenant_id, True, True) - return self._new_row_internal('vms', vm_dict, tenant_id, add_uuid=True, root_uuid=vnf_id, log=True, created_time=created_time) - - - def _new_net(self, net_dict, tenant_id, vnf_id = None, created_time=0): - #return self.new_row('nets', net_dict, tenant_id, True, True) - return self._new_row_internal('nets', net_dict, tenant_id, add_uuid=True, root_uuid=vnf_id, log=True, created_time=created_time) - - def _new_interface(self, interface_dict, tenant_id, vnf_id = None, created_time=0): - #return self.new_row('interfaces', interface_dict, tenant_id, True, True) - return self._new_row_internal('interfaces', interface_dict, tenant_id, add_uuid=True, root_uuid=vnf_id, log=True, created_time=created_time) + def new_vnf_as_a_whole2(self,nfvo_tenant,vnf_name,vnf_descriptor,VNFCDict): + self.logger.debug("Adding new vnf to the NFVO database") + tries = 2 + while tries: + created_time = time.time() + try: + with self.con: + + myVNFDict = {} + myVNFDict["name"] = vnf_name + myVNFDict["descriptor"] = vnf_descriptor['vnf'].get('descriptor') + myVNFDict["public"] = vnf_descriptor['vnf'].get('public', "false") + myVNFDict["description"] = vnf_descriptor['vnf']['description'] + myVNFDict["class"] = vnf_descriptor['vnf'].get('class',"MISC") + myVNFDict["tenant_id"] = vnf_descriptor['vnf'].get("tenant_id") + + vnf_id = self._new_row_internal('vnfs', myVNFDict, add_uuid=True, root_uuid=None, created_time=created_time) + #print "Adding new vms to the NFVO database" + #For each vm, we must create the appropriate vm in the NFVO database. + vmDict = {} + for _,vm in VNFCDict.iteritems(): + #This code could make the name of the vms grow and grow. + #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name + #vm['name'] = "%s-%s" % (vnf_name,vm['name']) + #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) + vm["vnf_id"] = vnf_id + created_time += 0.00001 + vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Internal vm id in NFVO DB: %s" % vm_id + vmDict[vm['name']] = vm_id + + #Collect the data interfaces of each VM/VNFC under the 'numas' field + dataifacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + dataifacesDict[vm['name']] = {} + for numa in vm.get('numas', []): + for dataiface in numa.get('interfaces',[]): + db_base._convert_bandwidth(dataiface) + dataifacesDict[vm['name']][dataiface['name']] = {} + dataifacesDict[vm['name']][dataiface['name']]['vpci'] = dataiface['vpci'] + dataifacesDict[vm['name']][dataiface['name']]['bw'] = dataiface['bandwidth'] + dataifacesDict[vm['name']][dataiface['name']]['model'] = "PF" if dataiface['dedicated']=="yes" else ("VF" if dataiface['dedicated']=="no" else "VFnotShared") + + #Collect the bridge interfaces of each VM/VNFC under the 'bridge-ifaces' field + bridgeInterfacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + if 'bridge-ifaces' in vm: + bridgeInterfacesDict[vm['name']] = {} + for bridgeiface in vm['bridge-ifaces']: + db_base._convert_bandwidth(bridgeiface) + bridgeInterfacesDict[vm['name']][bridgeiface['name']] = {} + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['vpci'] = bridgeiface.get('vpci',None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['mac'] = bridgeiface.get('mac_address',None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['bw'] = bridgeiface.get('bandwidth', None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['model'] = bridgeiface.get('model', None) + + #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. + #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" + internalconnList = [] + if 'internal-connections' in vnf_descriptor['vnf']: + for net in vnf_descriptor['vnf']['internal-connections']: + #print "Net name: %s. Description: %s" % (net['name'], net['description']) + + myNetDict = {} + myNetDict["name"] = net['name'] + myNetDict["description"] = net['description'] + if (net["implementation"] == "overlay"): + net["type"] = "bridge" + #It should give an error if the type is e-line. For the moment, we consider it as a bridge + elif (net["implementation"] == "underlay"): + if (net["type"] == "e-line"): + net["type"] = "ptp" + elif (net["type"] == "e-lan"): + net["type"] = "data" + net.pop("implementation") + myNetDict["type"] = net['type'] + myNetDict["vnf_id"] = vnf_id + + created_time += 0.00001 + net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + + if "ip-profile" in net: + ip_profile = net["ip-profile"] + myIPProfileDict = {} + myIPProfileDict["net_id"] = net_id + myIPProfileDict["ip_version"] = ip_profile.get('ip-version',"IPv4") + myIPProfileDict["subnet_address"] = ip_profile.get('subnet-address',None) + myIPProfileDict["gateway_address"] = ip_profile.get('gateway-address',None) + myIPProfileDict["dns_address"] = ip_profile.get('dns-address',None) + if ("dhcp" in ip_profile): + myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled',"true") + myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address',None) + myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count',None) + + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', myIPProfileDict) + + for element in net['elements']: + ifaceItem = {} + #ifaceItem["internal_name"] = "%s-%s-%s" % (net['name'],element['VNFC'], element['local_iface_name']) + ifaceItem["internal_name"] = element['local_iface_name'] + #ifaceItem["vm_id"] = vmDict["%s-%s" % (vnf_name,element['VNFC'])] + ifaceItem["vm_id"] = vmDict[element['VNFC']] + ifaceItem["net_id"] = net_id + ifaceItem["type"] = net['type'] + ifaceItem["ip_address"] = element.get('ip_address',None) + if ifaceItem ["type"] == "data": + ifaceItem["vpci"] = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['vpci'] + ifaceItem["bw"] = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['bw'] + ifaceItem["model"] = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['model'] + else: + ifaceItem["vpci"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['vpci'] + ifaceItem["mac"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['mac'] + ifaceItem["bw"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['bw'] + ifaceItem["model"] = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ]['model'] + internalconnList.append(ifaceItem) + #print "Internal net id in NFVO DB: %s" % net_id + + #print "Adding internal interfaces to the NFVO database (if any)" + for iface in internalconnList: + print "Iface name: %s" % iface['internal_name'] + created_time += 0.00001 + iface_id = self._new_row_internal('interfaces', iface, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Iface id in NFVO DB: %s" % iface_id + + #print "Adding external interfaces to the NFVO database" + for iface in vnf_descriptor['vnf']['external-connections']: + myIfaceDict = {} + #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) + myIfaceDict["internal_name"] = iface['local_iface_name'] + #myIfaceDict["vm_id"] = vmDict["%s-%s" % (vnf_name,iface['VNFC'])] + myIfaceDict["vm_id"] = vmDict[iface['VNFC']] + myIfaceDict["external_name"] = iface['name'] + myIfaceDict["type"] = iface['type'] + if iface["type"] == "data": + myIfaceDict["vpci"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] + myIfaceDict["bw"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] + myIfaceDict["model"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] + else: + myIfaceDict["vpci"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] + myIfaceDict["bw"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] + myIfaceDict["model"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] + myIfaceDict["mac"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['mac'] + print "Iface name: %s" % iface['name'] + created_time += 0.00001 + iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Iface id in NFVO DB: %s" % iface_id + + return vnf_id + + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) +# except KeyError as e2: +# exc_type, exc_obj, exc_tb = sys.exc_info() +# fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] +# self.logger.debug("Exception type: %s; Filename: %s; Line number: %s", exc_type, fname, exc_tb.tb_lineno) +# raise KeyError + tries -= 1 def new_scenario(self, scenario_dict): - for retry_ in range(0,2): + tries = 2 + while tries: created_time = time.time() try: with self.con: @@ -730,14 +341,11 @@ class nfvo_db(): tenant_id = scenario_dict.get('tenant_id') #scenario INSERT_={'tenant_id': tenant_id, - 'name': scenario_dict['name'], - 'description': scenario_dict['description'], - 'public': scenario_dict.get('public', "false")} + 'name': scenario_dict['name'], + 'description': scenario_dict['description'], + 'public': scenario_dict.get('public', "false")} - r,scenario_uuid = self._new_row_internal('scenarios', INSERT_, tenant_id, True, None, True,created_time) - if r<0: - print 'nfvo_db.new_scenario Error inserting at table scenarios: ' + scenario_uuid - return r,scenario_uuid + scenario_uuid = self._new_row_internal('scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) #sce_nets for net in scenario_dict['nets'].values(): net_dict={'scenario_id': scenario_uuid} @@ -750,10 +358,7 @@ class nfvo_db(): #TODO, must be json because of the GUI, change to yaml net_dict["graph"]=json.dumps(net["graph"]) created_time += 0.00001 - r,net_uuid = self._new_row_internal('sce_nets', net_dict, tenant_id, True, None, True, created_time) - if r<0: - print 'nfvo_db.new_scenario Error inserting at table sce_vnfs: ' + net_uuid - return r, net_uuid + net_uuid = self._new_row_internal('sce_nets', net_dict, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) net['uuid']=net_uuid #sce_vnfs for k,vnf in scenario_dict['vnfs'].items(): @@ -768,14 +373,11 @@ class nfvo_db(): #TODO, must be json because of the GUI, change to yaml INSERT_["graph"]=json.dumps(vnf["graph"]) created_time += 0.00001 - r,scn_vnf_uuid = self._new_row_internal('sce_vnfs', INSERT_, tenant_id, True, scenario_uuid, True, created_time) - if r<0: - print 'nfvo_db.new_scenario Error inserting at table sce_vnfs: ' + scn_vnf_uuid - return r, scn_vnf_uuid + scn_vnf_uuid = self._new_row_internal('sce_vnfs', INSERT_, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) vnf['scn_vnf_uuid']=scn_vnf_uuid #sce_interfaces for iface in vnf['ifaces'].values(): - print 'iface', iface + #print 'iface', iface if 'net_key' not in iface: continue iface['net_id'] = scenario_dict['nets'][ iface['net_key'] ]['uuid'] @@ -784,21 +386,105 @@ class nfvo_db(): 'interface_id': iface[ 'uuid' ] } created_time += 0.00001 - r,iface_uuid = self._new_row_internal('sce_interfaces', INSERT_, tenant_id, True, scenario_uuid, True, created_time) - if r<0: - print 'nfvo_db.new_scenario Error inserting at table sce_vnfs: ' + iface_uuid - return r, iface_uuid + iface_uuid = self._new_row_internal('sce_interfaces', INSERT_, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) - return 1, scenario_uuid + return scenario_uuid - except (mdb.Error, AttributeError), e: - print "nfvo_db.new_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 + + def new_scenario2(self, scenario_dict): + tries = 2 + while tries: + created_time = time.time() + try: + with self.con: + self.cur = self.con.cursor() + tenant_id = scenario_dict.get('tenant_id') + #scenario + INSERT_={'tenant_id': tenant_id, + 'name': scenario_dict['name'], + 'description': scenario_dict['description'], + 'public': scenario_dict.get('public', "false")} + + scenario_uuid = self._new_row_internal('scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) + #sce_nets + for net in scenario_dict['nets'].values(): + net_dict={'scenario_id': scenario_uuid} + net_dict["name"] = net["name"] + net_dict["type"] = net["type"] + net_dict["description"] = net.get("description") + net_dict["external"] = net.get("external", False) + if "graph" in net: + #net["graph"]=yaml.safe_dump(net["graph"],default_flow_style=True,width=256) + #TODO, must be json because of the GUI, change to yaml + net_dict["graph"]=json.dumps(net["graph"]) + created_time += 0.00001 + net_uuid = self._new_row_internal('sce_nets', net_dict, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) + net['uuid']=net_uuid + + if "ip-profile" in net: + ip_profile = net["ip-profile"] + myIPProfileDict = {} + myIPProfileDict["sce_net_id"] = net_uuid + myIPProfileDict["ip_version"] = ip_profile.get('ip-version',"IPv4") + myIPProfileDict["subnet_address"] = ip_profile.get('subnet-address',None) + myIPProfileDict["gateway_address"] = ip_profile.get('gateway-address',None) + myIPProfileDict["dns_address"] = ip_profile.get('dns-address',None) + if ("dhcp" in ip_profile): + myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled',"true") + myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address',None) + myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count',None) + + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', myIPProfileDict) + + #sce_vnfs + for k,vnf in scenario_dict['vnfs'].items(): + INSERT_={'scenario_id': scenario_uuid, + 'name': k, + 'vnf_id': vnf['uuid'], + #'description': scenario_dict['name'] + 'description': vnf['description'] + } + if "graph" in vnf: + #INSERT_["graph"]=yaml.safe_dump(vnf["graph"],default_flow_style=True,width=256) + #TODO, must be json because of the GUI, change to yaml + INSERT_["graph"]=json.dumps(vnf["graph"]) + created_time += 0.00001 + scn_vnf_uuid = self._new_row_internal('sce_vnfs', INSERT_, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) + vnf['scn_vnf_uuid']=scn_vnf_uuid + #sce_interfaces + for iface in vnf['ifaces'].values(): + #print 'iface', iface + if 'net_key' not in iface: + continue + iface['net_id'] = scenario_dict['nets'][ iface['net_key'] ]['uuid'] + INSERT_={'sce_vnf_id': scn_vnf_uuid, + 'sce_net_id': iface['net_id'], + 'interface_id': iface['uuid'], + 'ip_address': iface['ip_address'] + } + created_time += 0.00001 + iface_uuid = self._new_row_internal('sce_interfaces', INSERT_, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) + + return scenario_uuid + + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) +# except KeyError as e2: +# exc_type, exc_obj, exc_tb = sys.exc_info() +# fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] +# self.logger.debug("Exception type: %s; Filename: %s; Line number: %s", exc_type, fname, exc_tb.tb_lineno) +# raise KeyError + tries -= 1 def edit_scenario(self, scenario_dict): - for retry_ in range(0,2): + tries = 2 + while tries: modified_time = time.time() + item_changed=0 try: with self.con: self.cur = self.con.cursor() @@ -806,15 +492,17 @@ class nfvo_db(): tenant_id = scenario_dict.get('tenant_id') scenario_uuid = scenario_dict['uuid'] - where_text = "uuid='%s'" % scenario_uuid + where_text = "uuid='{}'".format(scenario_uuid) if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='%s' OR public='True')" % (tenant_id) - self.cur.execute("SELECT * FROM scenarios WHERE "+ where_text) + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) self.cur.fetchall() if self.cur.rowcount==0: - return -HTTP_Bad_Request, "No scenario found with this criteria " + where_text + raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) elif self.cur.rowcount>1: - return -HTTP_Bad_Request, "More than one scenario found with this criteria " + where_text + raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) #scenario nodes = {} @@ -826,10 +514,7 @@ class nfvo_db(): if "description" in scenario_dict: UPDATE_["description"] = scenario_dict["description"] if len(UPDATE_)>0: WHERE_={'tenant_id': tenant_id, 'uuid': scenario_uuid} - r,c = self.__update_rows('scenarios', UPDATE_, WHERE_, modified_time=modified_time) - if r<0: - print 'nfvo_db.edit_scenario Error ' + c + ' updating table scenarios: ' + scenario_uuid - return r,scenario_uuid + item_changed += self._update_rows('scenarios', UPDATE_, WHERE_, modified_time=modified_time) #sce_nets for node_id, node in nodes.items(): if "graph" in node: @@ -837,18 +522,14 @@ class nfvo_db(): #TODO, must be json because of the GUI, change to yaml node["graph"] = json.dumps(node["graph"]) WHERE_={'scenario_id': scenario_uuid, 'uuid': node_id} - r,c = self.__update_rows('sce_nets', node, WHERE_) - if r<=0: - r,c = self.__update_rows('sce_vnfs', node, WHERE_, modified_time=modified_time) - if r<0: - print 'nfvo_db.edit_scenario Error updating table sce_nets,sce_vnfs: ' + scenario_uuid - return r, scenario_uuid - return 1, scenario_uuid + #Try to change at sce_nets(version 0 API backward compatibility and sce_vnfs) + item_changed += self._update_rows('sce_nets', node, WHERE_) + item_changed += self._update_rows('sce_vnfs', node, WHERE_, modified_time=modified_time) + return item_changed - except (mdb.Error, AttributeError), e: - print "nfvo_db.new_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 # def get_instance_scenario(self, instance_scenario_id, tenant_id=None): # '''Obtain the scenario instance information, filtering by one or serveral of the tenant, uuid or name @@ -862,7 +543,7 @@ class nfvo_db(): # #scenario table # where_list=[] # if tenant_id is not None: where_list.append( "tenant_id='" + tenant_id +"'" ) -# if af.check_valid_uuid(instance_scenario_id): +# if db_base._check_valid_uuid(instance_scenario_id): # where_list.append( "uuid='" + instance_scenario_id +"'" ) # else: # where_list.append( "name='" + instance_scenario_id +"'" ) @@ -893,13 +574,13 @@ class nfvo_db(): # self.cur.execute("SELECT uuid, vim_interface_id, instance_vm_id, instance_net_id FROM instance_interfaces WHERE instance_scenario_id='"+ instance_scenario_dict['uuid'] + "'") # instance_scenario_dict['instance_interfaces'] = self.cur.fetchall() # -# af.convert_datetime2str(instance_scenario_dict) -# af.convert_str2boolean(instance_scenario_dict, ('public','shared','external') ) +# db_base._convert_datetime2str(instance_scenario_dict) +# db_base._convert_str2boolean(instance_scenario_dict, ('public','shared','external') ) # print "2******************************************************************" # return 1, instance_scenario_dict -# except (mdb.Error, AttributeError), e: +# except (mdb.Error, AttributeError) as e: # print "nfvo_db.get_instance_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) -# return self.format_error(e) +# return self._format_error(e) def get_scenario(self, scenario_id, tenant_id=None, datacenter_id=None): '''Obtain the scenario information, filtering by one or serveral of the tenant, uuid or name @@ -907,34 +588,35 @@ class nfvo_db(): if 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 ''' - for retry_ in range(0,2): + tries = 2 + while tries: try: with self.con: self.cur = self.con.cursor(mdb.cursors.DictCursor) - #scenario table - if af.check_valid_uuid(scenario_id): - where_text = "uuid='%s'" % scenario_id - else: - where_text = "name='%s'" % scenario_id + where_text = "uuid='{}'".format(scenario_id) if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='%s' OR public='True')" % (tenant_id) - cmd = "SELECT * FROM scenarios WHERE "+ where_text - print cmd + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE " + where_text + self.logger.debug(cmd) self.cur.execute(cmd) rows = self.cur.fetchall() if self.cur.rowcount==0: - return -HTTP_Bad_Request, "No scenario found with this criteria " + where_text + raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) elif self.cur.rowcount>1: - return -HTTP_Bad_Request, "More than one scenario found with this criteria " + where_text + raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) scenario_dict = rows[0] - + if scenario_dict["cloud_config"]: + 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='%s' ORDER BY created_at" % scenario_dict['uuid'] + cmd = "SELECT uuid,name,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() for vnf in scenario_dict['vnfs']: #sce_interfaces - cmd = "SELECT uuid,sce_net_id,interface_id FROM sce_interfaces WHERE sce_vnf_id='%s' ORDER BY created_at" %vnf['uuid'] + cmd = "SELECT scei.uuid,scei.sce_net_id,scei.interface_id,i.external_name,scei.ip_address FROM sce_interfaces as scei join interfaces as i on scei.interface_id=i.uuid WHERE scei.sce_vnf_id='{}' ORDER BY scei.created_at".format(vnf['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) vnf['interfaces'] = self.cur.fetchall() #vms @@ -942,43 +624,74 @@ class nfvo_db(): " FROM vnfs join vms on vnfs.uuid=vms.vnf_id " \ " WHERE vnfs.uuid='" + vnf['vnf_id'] +"'" \ " ORDER BY vms.created_at" + self.logger.debug(cmd) self.cur.execute(cmd) vnf['vms'] = self.cur.fetchall() for vm in vnf['vms']: if datacenter_id!=None: - self.cur.execute("SELECT vim_id FROM datacenters_images WHERE image_id='%s' AND datacenter_id='%s'" %(vm['image_id'],datacenter_id)) + cmd = "SELECT vim_id FROM datacenters_images WHERE image_id='{}' AND datacenter_id='{}'".format(vm['image_id'],datacenter_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'] - self.cur.execute("SELECT vim_id FROM datacenters_flavors WHERE flavor_id='%s' AND datacenter_id='%s'" %(vm['flavor_id'],datacenter_id)) + cmd = "SELECT vim_id FROM datacenters_flavors WHERE flavor_id='{}' AND datacenter_id='{}'".format(vm['flavor_id'],datacenter_id) + self.logger.debug(cmd) + self.cur.execute(cmd) if self.cur.rowcount==1: vim_flavor_dict = self.cur.fetchone() vm['vim_flavor_id']=vim_flavor_dict['vim_id'] #interfaces - cmd = "SELECT uuid,internal_name,external_name,net_id,type,vpci,mac,bw,model" \ + cmd = "SELECT uuid,internal_name,external_name,net_id,type,vpci,mac,bw,model,ip_address" \ " FROM interfaces" \ - " WHERE vm_id='%s'" \ - " ORDER BY created_at" % vm['uuid'] + " WHERE vm_id='{}'" \ + " ORDER BY created_at".format(vm['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) vm['interfaces'] = self.cur.fetchall() #nets every net of a vms - self.cur.execute("SELECT uuid,name,type,description FROM nets WHERE vnf_id='" + vnf['vnf_id'] +"'" ) + cmd = "SELECT uuid,name,type,description FROM nets WHERE vnf_id='{}'".format(vnf['vnf_id']) + self.logger.debug(cmd) + self.cur.execute(cmd) vnf['nets'] = self.cur.fetchall() + for vnf_net in vnf['nets']: + SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" + cmd = "SELECT {} FROM ip_profiles WHERE net_id='{}'".format(SELECT_,vnf_net['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + ipprofiles = self.cur.fetchall() + if self.cur.rowcount==1: + vnf_net["ip_profile"] = ipprofiles[0] + elif self.cur.rowcount>1: + 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" \ - " FROM sce_nets WHERE scenario_id='%s'" \ - " ORDER BY created_at " % scenario_dict['uuid'] + " FROM sce_nets WHERE scenario_id='{}'" \ + " ORDER BY created_at ".format(scenario_dict['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) scenario_dict['nets'] = self.cur.fetchall() #datacenter_nets for net in scenario_dict['nets']: if str(net['external']) == 'false': + SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" + cmd = "SELECT {} FROM ip_profiles WHERE sce_net_id='{}'".format(SELECT_,net['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + ipprofiles = self.cur.fetchall() + if self.cur.rowcount==1: + net["ip_profile"] = ipprofiles[0] + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one ip-profile found with this criteria: sce_net_id='{}'".format(net['uuid']), db_base.HTTP_Bad_Request) continue - WHERE_=" WHERE name='%s'" % net['name'] + WHERE_=" WHERE name='{}'".format(net['name']) if datacenter_id!=None: - WHERE_ += " AND datacenter_id='%s'" % datacenter_id - self.cur.execute("SELECT vim_net_id FROM datacenter_nets" + WHERE_ ) + WHERE_ += " AND datacenter_id='{}'".format(datacenter_id) + cmd = "SELECT vim_net_id FROM datacenter_nets" + WHERE_ + self.logger.debug(cmd) + self.cur.execute(cmd) d_net = self.cur.fetchone() if d_net==None or datacenter_id==None: #print "nfvo_db.get_scenario() WARNING external net %s not found" % net['name'] @@ -986,144 +699,135 @@ class nfvo_db(): else: net['vim_id']=d_net['vim_net_id'] - af.convert_datetime2str(scenario_dict) - af.convert_str2boolean(scenario_dict, ('public','shared','external') ) - return 1, scenario_dict - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c - - def get_uuid_from_name(self, table, name): - '''Searchs in table the name and returns the uuid - ''' - for retry_ in range(0,2): - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - where_text = "name='" + name +"'" - self.cur.execute("SELECT * FROM " + table + " WHERE "+ where_text) - rows = self.cur.fetchall() - if self.cur.rowcount==0: - return 0, "Name %s not found in table %s" %(name, table) - elif self.cur.rowcount>1: - return self.cur.rowcount, "More than one VNF with name %s found in table %s" %(name, table) - return self.cur.rowcount, rows[0]["uuid"] - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_uuid_from_name DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + db_base._convert_datetime2str(scenario_dict) + db_base._convert_str2boolean(scenario_dict, ('public','shared','external') ) + return scenario_dict + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 def delete_scenario(self, scenario_id, tenant_id=None): '''Deletes a scenario, filtering by one or several of the tenant, uuid or name scenario_id is the uuid or the name if it is not a valid uuid format Only one scenario must mutch the filtering or an error is returned ''' - for retry_ in range(0,2): + tries = 2 + while tries: try: with self.con: self.cur = self.con.cursor(mdb.cursors.DictCursor) #scenario table - if af.check_valid_uuid(scenario_id): - where_text = "uuid='%s'" % scenario_id - else: - where_text = "name='%s'" % scenario_id + where_text = "uuid='{}'".format(scenario_id) if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='%s' OR public='True')" % tenant_id - self.cur.execute("SELECT * FROM scenarios WHERE "+ where_text) + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) rows = self.cur.fetchall() if self.cur.rowcount==0: - return -HTTP_Bad_Request, "No scenario found with this criteria " + where_text + raise db_base.db_base_Exception("No scenario found where " + where_text, db_base.HTTP_Bad_Request) elif self.cur.rowcount>1: - return -HTTP_Bad_Request, "More than one scenario found with this criteria " + where_text + raise db_base.db_base_Exception("More than one scenario found where " + where_text, db_base.HTTP_Bad_Request) scenario_uuid = rows[0]["uuid"] scenario_name = rows[0]["name"] #sce_vnfs - self.cur.execute("DELETE FROM scenarios WHERE uuid='" + scenario_uuid + "'") + cmd = "DELETE FROM scenarios WHERE uuid='{}'".format(scenario_uuid) + self.logger.debug(cmd) + self.cur.execute(cmd) - return 1, scenario_uuid + " " + scenario_name - except (mdb.Error, AttributeError), e: - print "nfvo_db.delete_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e, "delete", "instances running") - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + return scenario_uuid + " " + scenario_name + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries, "delete", "instances running") + tries -= 1 def new_instance_scenario_as_a_whole(self,tenant_id,instance_scenario_name,instance_scenario_description,scenarioDict): - print "Adding new instance scenario to the NFVO database" - for retry_ in range(0,2): + tries = 2 + while tries: created_time = time.time() try: with self.con: self.cur = self.con.cursor() #instance_scenarios - datacenter_tenant_id = scenarioDict['datacenter_tenant_id'] datacenter_id = scenarioDict['datacenter_id'] INSERT_={'tenant_id': tenant_id, - 'datacenter_tenant_id': datacenter_tenant_id, + 'datacenter_tenant_id': scenarioDict["datacenter2tenant"][datacenter_id], 'name': instance_scenario_name, 'description': instance_scenario_description, 'scenario_id' : scenarioDict['uuid'], 'datacenter_id': datacenter_id } - r,instance_uuid = self._new_row_internal('instance_scenarios', INSERT_, tenant_id, True, None, True, created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_scenarios: ' + instance_uuid - return r, instance_uuid + if scenarioDict.get("cloud-config"): + INSERT_["cloud_config"] = yaml.safe_dump(scenarioDict["cloud-config"], default_flow_style=True, width=256) + + instance_uuid = self._new_row_internal('instance_scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) net_scene2instance={} #instance_nets #nets interVNF for net in scenarioDict['nets']: - INSERT_={'vim_net_id': net['vim_id'], 'external': net['external'], 'instance_scenario_id':instance_uuid } #, 'type': net['type'] - INSERT_['datacenter_id'] = net.get('datacenter_id', datacenter_id) - INSERT_['datacenter_tenant_id'] = net.get('datacenter_tenant_id', datacenter_tenant_id) - if net.get("uuid"): - INSERT_['sce_net_id'] = net['uuid'] - created_time += 0.00001 - r,instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, tenant_id, True, instance_uuid, True, created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_nets: ' + instance_net_uuid - return r, instance_net_uuid - net_scene2instance[ net['uuid'] ] = instance_net_uuid - net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid + net_scene2instance[ net['uuid'] ] ={} + datacenter_site_id = net.get('datacenter_id', datacenter_id) + if not "vim_id_sites" in net: + net["vim_id_sites"] ={datacenter_site_id: net['vim_id']} + net["vim_id_sites"]["datacenter_site_id"] = {datacenter_site_id: net['vim_id']} + sce_net_id = net.get("uuid") + + for datacenter_site_id,vim_id in net["vim_id_sites"].iteritems(): + INSERT_={'vim_net_id': vim_id, 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] + INSERT_['datacenter_id'] = datacenter_site_id + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] + if sce_net_id: + INSERT_['sce_net_id'] = sce_net_id + created_time += 0.00001 + instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) + net_scene2instance[ sce_net_id ][datacenter_site_id] = instance_net_uuid + net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid + + if 'ip_profile' in net: + net['ip_profile']['net_id'] = None + net['ip_profile']['sce_net_id'] = None + net['ip_profile']['instance_net_id'] = instance_net_uuid + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) #instance_vnfs for vnf in scenarioDict['vnfs']: + datacenter_site_id = vnf.get('datacenter_id', datacenter_id) INSERT_={'instance_scenario_id': instance_uuid, 'vnf_id': vnf['vnf_id'] } - INSERT_['datacenter_id'] = vnf.get('datacenter_id', datacenter_id) - INSERT_['datacenter_tenant_id'] = vnf.get('datacenter_tenant_id', datacenter_tenant_id) + INSERT_['datacenter_id'] = datacenter_site_id + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] if vnf.get("uuid"): INSERT_['sce_vnf_id'] = vnf['uuid'] created_time += 0.00001 - r,instance_vnf_uuid = self._new_row_internal('instance_vnfs', INSERT_, tenant_id, True, instance_uuid, True,created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_vnfs: ' + instance_vnf_uuid - return r, instance_vnf_uuid + instance_vnf_uuid = self._new_row_internal('instance_vnfs', INSERT_, True, instance_uuid, created_time) vnf['uuid'] = instance_vnf_uuid #overwrite scnario uuid by instance uuid #instance_nets #nets intraVNF for net in vnf['nets']: - INSERT_={'vim_net_id': net['vim_id'], 'external': 'false', 'instance_scenario_id':instance_uuid } #, 'type': net['type'] - INSERT_['datacenter_id'] = net.get('datacenter_id', datacenter_id) - INSERT_['datacenter_tenant_id'] = net.get('datacenter_tenant_id', datacenter_tenant_id) + net_scene2instance[ net['uuid'] ] = {} + INSERT_={'vim_net_id': net['vim_id'], 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] + INSERT_['datacenter_id'] = net.get('datacenter_id', datacenter_site_id) + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_id] if net.get("uuid"): INSERT_['net_id'] = net['uuid'] created_time += 0.00001 - r,instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, tenant_id, True, instance_uuid, True,created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_nets: ' + instance_net_uuid - return r, instance_net_uuid - net_scene2instance[ net['uuid'] ] = instance_net_uuid + instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) + net_scene2instance[ net['uuid'] ][datacenter_site_id] = instance_net_uuid net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid - + + if 'ip_profile' in net: + net['ip_profile']['net_id'] = None + net['ip_profile']['sce_net_id'] = None + net['ip_profile']['instance_net_id'] = instance_net_uuid + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) + #instance_vms for vm in vnf['vms']: INSERT_={'instance_vnf_id': instance_vnf_uuid, 'vm_id': vm['uuid'], 'vim_vm_id': vm['vim_id'] } created_time += 0.00001 - r,instance_vm_uuid = self._new_row_internal('instance_vms', INSERT_, tenant_id, True, instance_uuid, True, created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_vms: ' + instance_vm_uuid - return r, instance_vm_uuid + instance_vm_uuid = self._new_row_internal('instance_vms', INSERT_, True, instance_uuid, created_time) vm['uuid'] = instance_vm_uuid #overwrite scnario uuid by instance uuid #instance_interfaces @@ -1133,64 +837,67 @@ class nfvo_db(): #check if is connected to a inter VNFs net for iface in vnf['interfaces']: if iface['interface_id'] == interface['uuid']: + if 'ip_address' in iface: + interface['ip_address'] = iface['ip_address'] net_id = iface.get('sce_net_id', None) break if net_id is None: continue interface_type='external' if interface['external_name'] is not None else 'internal' - INSERT_={'instance_vm_id': instance_vm_uuid, 'instance_net_id': net_scene2instance[net_id], - 'interface_id': interface['uuid'], 'vim_interface_id': interface.get('vim_id'), 'type': interface_type } + INSERT_={'instance_vm_id': instance_vm_uuid, 'instance_net_id': net_scene2instance[net_id][datacenter_site_id], + 'interface_id': interface['uuid'], 'vim_interface_id': interface.get('vim_id'), 'type': interface_type, + 'ip_address': interface.get('ip_address') } #created_time += 0.00001 - r,interface_uuid = self._new_row_internal('instance_interfaces', INSERT_, tenant_id, True, instance_uuid, True) #, created_time) - if r<0: - print 'nfvo_db.new_instance_scenario_as_a_whole() Error inserting at table instance_interfaces: ' + interface_uuid - return r, interface_uuid + interface_uuid = self._new_row_internal('instance_interfaces', INSERT_, True, instance_uuid) #, created_time) interface['uuid'] = interface_uuid #overwrite scnario uuid by instance uuid - - - - return 1, instance_uuid - - except (mdb.Error, AttributeError), e: - print "new_instance_scenario_as_a_whole DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + return instance_uuid + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 def get_instance_scenario(self, instance_id, tenant_id=None, verbose=False): '''Obtain the instance information, filtering by one or several of the tenant, uuid or name instance_id is the uuid or the name if it is not a valid uuid format Only one instance must mutch the filtering or an error is returned ''' - for retry_ in range(0,2): + tries = 2 + while tries: try: with self.con: self.cur = self.con.cursor(mdb.cursors.DictCursor) #instance table where_list=[] if tenant_id is not None: where_list.append( "inst.tenant_id='" + tenant_id +"'" ) - if af.check_valid_uuid(instance_id): + if db_base._check_valid_uuid(instance_id): where_list.append( "inst.uuid='" + instance_id +"'" ) else: where_list.append( "inst.name='" + instance_id +"'" ) where_text = " AND ".join(where_list) - command = "SELECT inst.uuid as uuid,inst.name as name,inst.scenario_id as scenario_id, datacenter_id" +\ + 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'" +\ " FROM instance_scenarios as inst join scenarios as s on inst.scenario_id=s.uuid"+\ " WHERE " + where_text - self.cur.execute(command) + self.logger.debug(cmd) + self.cur.execute(cmd) rows = self.cur.fetchall() + if self.cur.rowcount==0: - return -HTTP_Bad_Request, "No instance found with this criteria " + where_text + raise db_base.db_base_Exception("No instance found where " + where_text, db_base.HTTP_Not_Found) elif self.cur.rowcount>1: - return -HTTP_Bad_Request, "More than one instance found with this criteria " + where_text + raise db_base.db_base_Exception("More than one instance found where " + where_text, db_base.HTTP_Bad_Request) instance_dict = rows[0] + if instance_dict["cloud_config"]: + instance_dict["cloud-config"] = yaml.load(instance_dict["cloud_config"]) + del instance_dict["cloud_config"] #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='%s'" \ - " ORDER BY iv.created_at " % instance_dict['uuid'] + " WHERE iv.instance_scenario_id='{}'" \ + " ORDER BY iv.created_at ".format(instance_dict['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) instance_dict['vnfs'] = self.cur.fetchall() for vnf in instance_dict['vnfs']: @@ -1198,15 +905,17 @@ class nfvo_db(): #instance vms cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as created_at, name "\ " FROM instance_vms as iv join vms on iv.vm_id=vms.uuid "\ - " WHERE instance_vnf_id='%s' ORDER BY iv.created_at" % vnf['uuid'] + " WHERE instance_vnf_id='{}' ORDER BY iv.created_at".format(vnf['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) vnf['vms'] = self.cur.fetchall() for vm in vnf['vms']: vm_manage_iface_list=[] #instance_interfaces - cmd = "SELECT vim_interface_id, instance_net_id, internal_name,external_name, mac_address, ip_address, vim_info, i.type as type "\ + cmd = "SELECT vim_interface_id, instance_net_id, internal_name,external_name, mac_address, ii.ip_address as ip_address, vim_info, i.type as type "\ " FROM instance_interfaces as ii join interfaces as i on ii.interface_id=i.uuid "\ - " WHERE instance_vm_id='%s' ORDER BY created_at" % vm['uuid'] + " WHERE instance_vm_id='{}' ORDER BY created_at".format(vm['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd ) vm['interfaces'] = self.cur.fetchall() for iface in vm['interfaces']: @@ -1223,26 +932,27 @@ class nfvo_db(): #from_text = "instance_nets join instance_scenarios on instance_nets.instance_scenario_id=instance_scenarios.uuid " + \ # "join sce_nets on instance_scenarios.scenario_id=sce_nets.scenario_id" #where_text = "instance_nets.instance_scenario_id='"+ instance_dict['uuid'] + "'" - cmd = "SELECT uuid,vim_net_id,status,error_msg,vim_info,external, sce_net_id, net_id as vnf_net_id, datacenter_id, datacenter_tenant_id"\ + cmd = "SELECT uuid,vim_net_id,status,error_msg,vim_info,created, sce_net_id, net_id as vnf_net_id, datacenter_id, datacenter_tenant_id"\ " FROM instance_nets" \ - " WHERE instance_scenario_id='%s' ORDER BY created_at" % instance_dict['uuid'] + " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) + self.logger.debug(cmd) self.cur.execute(cmd) instance_dict['nets'] = self.cur.fetchall() - af.convert_datetime2str(instance_dict) - af.convert_str2boolean(instance_dict, ('public','shared','external') ) - return 1, instance_dict - except (mdb.Error, AttributeError), e: - print "nfvo_db.get_instance_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + db_base._convert_datetime2str(instance_dict) + db_base._convert_str2boolean(instance_dict, ('public','shared','created') ) + return instance_dict + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 def delete_instance_scenario(self, instance_id, tenant_id=None): '''Deletes a instance_Scenario, filtering by one or serveral of the tenant, uuid or name instance_id is the uuid or the name if it is not a valid uuid format Only one instance_scenario must mutch the filtering or an error is returned ''' - for retry_ in range(0,2): + tries = 2 + while tries: try: with self.con: self.cur = self.con.cursor(mdb.cursors.DictCursor) @@ -1250,28 +960,32 @@ class nfvo_db(): #instance table where_list=[] if tenant_id is not None: where_list.append( "tenant_id='" + tenant_id +"'" ) - if af.check_valid_uuid(instance_id): + if db_base._check_valid_uuid(instance_id): where_list.append( "uuid='" + instance_id +"'" ) else: where_list.append( "name='" + instance_id +"'" ) where_text = " AND ".join(where_list) - self.cur.execute("SELECT * FROM instance_scenarios WHERE "+ where_text) + cmd = "SELECT * FROM instance_scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) rows = self.cur.fetchall() + if self.cur.rowcount==0: - return -HTTP_Bad_Request, "No instance scenario found with this criteria " + where_text + raise db_base.db_base_Exception("No instance found where " + where_text, db_base.HTTP_Bad_Request) elif self.cur.rowcount>1: - return -HTTP_Bad_Request, "More than one instance scenario found with this criteria " + where_text + raise db_base.db_base_Exception("More than one instance found where " + where_text, db_base.HTTP_Bad_Request) instance_uuid = rows[0]["uuid"] instance_name = rows[0]["name"] #sce_vnfs - self.cur.execute("DELETE FROM instance_scenarios WHERE uuid='" + instance_uuid + "'") + cmd = "DELETE FROM instance_scenarios WHERE uuid='{}'".format(instance_uuid) + self.logger.debug(cmd) + self.cur.execute(cmd) - return 1, instance_uuid + " " + instance_name - except (mdb.Error, AttributeError), e: - print "nfvo_db.delete_instance_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e, "delete", "No dependences can avoid deleting!!!!") - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + return instance_uuid + " " + instance_name + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries, "delete", "No dependences can avoid deleting!!!!") + tries -= 1 def new_instance_scenario(self, instance_scenario_dict, tenant_id): #return self.new_row('vnfs', vnf_dict, None, tenant_id, True, True) @@ -1335,21 +1049,24 @@ class nfvo_db(): new_net_list: the new values to be inserted. If empty it only deletes the existing nets Return: (Inserted items, Deleted items) if OK, (-Error, text) if error ''' - for retry_ in range(0,2): + tries = 2 + while tries: created_time = time.time() try: with self.con: self.cur = self.con.cursor() - cmd="DELETE FROM datacenter_nets WHERE datacenter_id='%s'" % datacenter_id - print cmd + cmd="DELETE FROM datacenter_nets WHERE datacenter_id='{}'".format(datacenter_id) + self.logger.debug(cmd) self.cur.execute(cmd) deleted = self.cur.rowcount + inserted = 0 for new_net in new_net_list: created_time += 0.00001 - self._new_row_internal('datacenter_nets', new_net, tenant_id=None, add_uuid=True, created_time=created_time) - return len (new_net_list), deleted - except (mdb.Error, AttributeError), e: - print "nfvo_db.update_datacenter_nets DB Exception %d: %s" % (e.args[0], e.args[1]) - r,c = self.format_error(e) - if r!=-HTTP_Request_Timeout or retry_==1: return r,c + self._new_row_internal('datacenter_nets', new_net, add_uuid=True, created_time=created_time) + inserted += 1 + return inserted, deleted + except (mdb.Error, AttributeError) as e: + self._format_error(e, tries) + tries -= 1 +