x/terracotta
Code Issues Proposed changes

Converted host and VM IDs to integers

Browse Source
This commit is contained in:
Anton Beloglazov 2013-09-30 10:38:01 +10:00
parent 8823968718
commit bd1ea44966
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neat/db.py
View File

@ -93,7 +93,7 @@ class Database(object):
vru1.outerjoin(vru2, and_( vru1.outerjoin(vru2, and_(
vru1.c.vm_id == vru2.c.vm_id, vru1.c.vm_id == vru2.c.vm_id,
vru1.c.id < vru2.c.id))]). \ vru1.c.id < vru2.c.id))]). \
where(vru2.c.id == None) where(vru2.c.id == None)
vms_cpu_mhz = dict(self.connection.execute(sel).fetchall()) vms_cpu_mhz = dict(self.connection.execute(sel).fetchall())
vms_uuids = dict(self.vms.select().execute().fetchall()) vms_uuids = dict(self.vms.select().execute().fetchall())
@ -113,16 +113,16 @@ class Database(object):
:type uuid: str[36] :type uuid: str[36]
:return: The ID of the VM. :return: The ID of the VM.
:rtype: number :rtype: int
""" """
sel = select([self.vms.c.id]).where(self.vms.c.uuid == uuid) sel = select([self.vms.c.id]).where(self.vms.c.uuid == uuid)
row = self.connection.execute(sel).fetchone() row = self.connection.execute(sel).fetchone()
if row is None: if row is None:
id = self.vms.insert().execute(uuid=uuid).inserted_primary_key[0] id = self.vms.insert().execute(uuid=uuid).inserted_primary_key[0]
log.info('Created a new DB record for a VM %s, id=%d', uuid, id) log.info('Created a new DB record for a VM %s, id=%d', uuid, id)
return id return int(id)
else: else:
return row['id'] return int(row['id'])
@contract @contract
def insert_vm_cpu_mhz(self, data): def insert_vm_cpu_mhz(self, data):
@ -156,7 +156,7 @@ class Database(object):
:type ram: int,>0 :type ram: int,>0
:return: The ID of the host. :return: The ID of the host.
:rtype: number :rtype: int
""" """
sel = select([self.hosts.c.id]). \ sel = select([self.hosts.c.id]). \
where(self.hosts.c.hostname == hostname) where(self.hosts.c.hostname == hostname)
@ -169,14 +169,14 @@ class Database(object):
ram=ram).inserted_primary_key[0] ram=ram).inserted_primary_key[0]
log.info('Created a new DB record for a host %s, id=%d', log.info('Created a new DB record for a host %s, id=%d',
hostname, id) hostname, id)
return id return int(id)
else: else:
self.connection.execute(self.hosts.update(). self.connection.execute(self.hosts.update().
where(self.hosts.c.id == row['id']). where(self.hosts.c.id == row['id']).
values(cpu_mhz=cpu_mhz, values(cpu_mhz=cpu_mhz,
cpu_cores=cpu_cores, cpu_cores=cpu_cores,
ram=ram)) ram=ram))
return row['id'] return int(row['id'])
@contract @contract
def insert_host_cpu_mhz(self, hostname, cpu_mhz): def insert_host_cpu_mhz(self, hostname, cpu_mhz):