port sipb-xen-database to sqlalchemy-0.4

[invirt/packages/invirt-database.git] / python / database / models.py

diff --git a/python/database/models.py b/python/database/models.py
index ee207f6..6574ff1 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -1,4 +1,5 @@
 from sqlalchemy import *
+from sqlalchemy.orm import create_session, relation
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
@@ -20,9 +21,10 @@ __all__ = ['meta',
            'Type',
            'CDROM',
            'Autoinstall',
+           'or_',
            ]
 
-meta = DynamicMetaData()
+meta = ThreadLocalMetaData()
 ctx = SessionContext(create_session)
 
 machine_table = Table('machines', meta,
@@ -36,7 +38,8 @@ machine_table = Table('machines', meta,
        Column('administrator', String, nullable=False, default=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
-       Column('cpus', Integer, nullable=False, default=1))
+       Column('cpus', Integer, nullable=False, default=1),
+       Column('adminable', Boolean, nullable=False, default=False))
 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),