x/terracotta
Code Issues Proposed changes

Added insert_vm_migration

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-18 10:55:03 +11:00
parent 9922d95b58
commit 6f5e0a8aa5
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neat/db.py
View File

@ -300,3 +300,18 @@ class Database(object):
self.host_overload.insert().execute(
host_id=self.select_host_id(hostname),
overload=int(overload))
@contract
def insert_vm_migration(self, vm, hostname):
""" Insert a VM migration.
:param hostname: A VM UUID.
:type hostname: str[36]
:param hostname: A host name.
:type hostname: str
"""
self.vm_migrations.insert().execute(
vm_id=self.select_vm_id(vm),
host_id=self.select_host_id(hostname))

4
neat/db_utils.py
View File

@ -60,8 +60,8 @@ def init_db(sql_connection):
Table('vm_migrations', metadata,
Column('id', Integer, primary_key=True),
Column('vm_id', Integer, ForeignKey('vms.id'), nullable=False),
Column('timestamp', DateTime, default=func.now()),
Column('hostname', String(255), nullable=False))
Column('host_id', Integer, ForeignKey('hosts.id'), nullable=False),
Column('timestamp', DateTime, default=func.now()))
host_states = \
Table('host_states', metadata,

11
tests/test_db.py
View File

@ -279,3 +279,14 @@ class Db(TestCase):
lambda x: x[1] == hosts['host2'],
result), key=lambda x: x[0])]
self.assertEqual(host2, [0, 1])
@qc(1)
def insert_select():
db = db_utils.init_db('sqlite:///:memory:')
db.vms.insert().execute(uuid='x' * 36).inserted_primary_key[0]
vm_id = db.vms.insert().execute(uuid='vm' * 18).inserted_primary_key[0]
host_id = db.update_host('host', 1, 1, 1)
db.insert_vm_migration('vm' * 18, 'host')
result = db.vm_migrations.select().execute().first()
assert result[1] == vm_id
assert result[2] == host_id

4
tests/test_db_utils.py
View File

@ -43,9 +43,11 @@ class DbUtils(TestCase):
assert list(db.vm_resource_usage.foreign_keys)[0].target_fullname \
== 'vms.id'
assert db.vm_migrations.c.keys() == \
['id', 'vm_id', 'timestamp', 'hostname']
['id', 'vm_id', 'host_id', 'timestamp']
assert list(db.vm_migrations.foreign_keys)[0].target_fullname \
== 'vms.id'
assert list(db.vm_migrations.foreign_keys)[1].target_fullname \
== 'hosts.id'
assert db.host_states.c.keys() == \
['id', 'host_id', 'timestamp', 'state']
assert list(db.host_states.foreign_keys)[0].target_fullname \