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

diff --git a/python/database/models.py b/python/database/models.py
index 2944a1f..6b53a2a 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -5,6 +5,9 @@ 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
+
 __all__ = ['meta',
            'session',
            'clear_cache',
@@ -86,47 +89,41 @@ 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('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)
+class Machine(Record):
+    _identity_field = 'name'
 
-class MachineAccess(object):
-    def __repr__(self):
-        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
+class MachineAccess(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 NIC(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 Disk(Record):
+    pass
 
-class Type(object):
-    def __repr__(self):
-        return "<Type %s: %s>" % (self.type_id, self.description)
+class Type(Record):
+    _identity_field = 'type_id'
 
-class Mirror(object):
-    def __repr__(self):
-        return "<Mirror %s>" % (self.mirror_id)
+class Mirror(Record):
+    _identity_field = 'mirror_id'
 
-class CDROM(object):
-    def __repr__(self):
-        return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
+class CDROM(Record):
+    _identity_field = 'cdrom_id'
 
-class Autoinstall(object):
-    def __repr__(self):
-        return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
-
-from owner import Owner
+class Autoinstall(Record):
+    _identity_field = 'autoinstall_id'
 
 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),