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

diff --git a/python/database/models.py b/python/database/models.py
index 6b53a2a..25d5f77 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -5,8 +5,7 @@ from sqlalchemy.orm import create_session, relation
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
-from record import *
-from owner import Owner
+from invirt.database import record
 
 __all__ = ['meta',
            'session',
@@ -20,6 +19,7 @@ __all__ = ['meta',
            'mirrors_table',
            'autoinstalls_table',
            'owners_table',
+           'admins_table',
            'Machine',
            'MachineAccess',
            'NIC',
@@ -29,6 +29,7 @@ __all__ = ['meta',
            'Mirror',
            'Autoinstall',
            'Owner',
+           'Admin',
            'or_',
            ]
 
@@ -53,7 +54,8 @@ nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
        Column('mac_addr', String, nullable=False, primary_key=True),
        Column('ip', String, nullable=False, unique=True),
-       Column('hostname', String, nullable=True))
+       Column('hostname', String, nullable=True),
+       Column('reusable', Boolean, nullable=False, default=True))
 
 disk_table = Table('disks', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),
@@ -101,30 +103,38 @@ machine_access_table = Table('machine_access', meta,
        Column('user', String, nullable=False, index=True),
        PrimaryKeyConstraint('machine_id', 'user'))
 
-class Machine(Record):
+admins_table = Table('admins', meta,
+       Column('user', String, nullable=False, index=True, primary_key=True))
+
+class Machine(record.Record):
     _identity_field = 'name'
 
-class MachineAccess(Record):
+class MachineAccess(record.Record):
     pass
 
-class NIC(Record):
+class NIC(record.Record):
     pass
 
-class Disk(Record):
+class Disk(record.Record):
     pass
 
-class Type(Record):
+class Type(record.Record):
     _identity_field = 'type_id'
 
-class Mirror(Record):
+class Mirror(record.Record):
     _identity_field = 'mirror_id'
 
-class CDROM(Record):
+class CDROM(record.Record):
     _identity_field = 'cdrom_id'
 
-class Autoinstall(Record):
+class Autoinstall(record.Record):
     _identity_field = 'autoinstall_id'
 
+class Admin(record.Record):
+    _identity_field = 'user'
+
+from invirt.database.owner import Owner
+
 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
                           'disks': relation(Disk, backref="machine"),
@@ -139,6 +149,7 @@ session.mapper(CDROM, cdroms_table,
                properties={'mirror': relation(Mirror, backref="cdroms")})
 session.mapper(Autoinstall, autoinstalls_table)
 session.mapper(Owner, owners_table)
+session.mapper(Admin, admins_table)
 
 def clear_cache():
     """Clear sqlalchemy's cache