X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/f397db06b0260d780be34a33d1a158bf894e2a8f..fe3cf67c45ba77d082eeadfc191d627b43373cc1:/python/database/models.py

diff --git a/python/database/models.py b/python/database/models.py
index ee207f6..6574ff1 100644
--- 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),