X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/9cf145e794628fbc4bf11b663fa301404cb0759a..669460d12b74b5af73b82b40b6c413b8298b6fcb:/python/database/models.py

diff --git a/python/database/models.py b/python/database/models.py
index 798934a..ba23c6e 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -5,6 +5,8 @@ from sqlalchemy.orm import create_session, relation
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
+from invirt.database import record
+
 __all__ = ['meta',
            'session',
            'clear_cache',
@@ -50,7 +52,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),
@@ -86,51 +89,49 @@ autoinstalls_table = Table('autoinstalls', meta,
 
 owners_table = Table('owners', meta,
        Column('owner_id', String, primary_key=True, nullable=False),
-       Column('ram_quota_total', Integer, nullable=True),
-       Column('ram_quota_single', Integer, nullable=True),
-       Column('disk_quota_total', Integer, nullable=True),
-       Column('disk_quota_single', Integer, nullable=True),
-       Column('vms_quota_total', Integer, nullable=True),
-       Column('vms_quota_active', Integer, nullable=True))
+       Column('ram_quota_total', Integer, nullable=True, default=None),
+       Column('ram_quota_single', Integer, nullable=True, default=None),
+       Column('disk_quota_total', Integer, nullable=True, default=None),
+       Column('disk_quota_single', Integer, nullable=True, default=None),
+       Column('vms_quota_total', Integer, nullable=True, default=None),
+       Column('vms_quota_active', Integer, nullable=True, default=None))
 
 machine_access_table = Table('machine_access', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
        Column('user', String, nullable=False, index=True),
        PrimaryKeyConstraint('machine_id', 'user'))
 
-class Machine(object):
-    def __repr__(self):
-        return "<Machine %s: name='%s' owner='%s'>" % (self.machine_id, self.name, self.owner)
+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.Record):
+    pass
 
-class MachineAccess(object):
-    def __repr__(self):
-        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
+class NIC(record.Record):
+    pass
 
-class NIC(object):
-    def __repr__(self):
-        return "<NIC: mac='%s' machine='%s' ip='%s' hostname='%s'>" % (self.mac_addr, self.machine_id, self.ip, self.hostname)
+class Disk(record.Record):
+    pass
 
-class Disk(object):
-    def __repr__(self):
-        return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
+class Type(record.Record):
+    _identity_field = 'type_id'
 
-class Type(object):
-    def __repr__(self):
-        return "<Type %s: %s>" % (self.type_id, self.description)
+class Mirror(record.Record):
+    _identity_field = 'mirror_id'
 
-class Mirror(object):
-    def __repr__(self):
-        return "<Mirror %s>" % (self.mirror_id)
+class CDROM(record.Record):
+    _identity_field = 'cdrom_id'
 
-class CDROM(object):
-    def __repr__(self):
-        return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
+class Autoinstall(record.Record):
+    _identity_field = 'autoinstall_id'
 
-class Autoinstall(object):
-    def __repr__(self):
-        return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
+class Admin(record.Record):
+    _identity_field = 'user'
 
-from owner import Owner
+from invirt.database.owner import Owner
 
 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
@@ -146,6 +147,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