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

diff --git a/python/database/models.py b/python/database/models.py
index 67d5de8..e44aff3 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -14,6 +14,7 @@ __all__ = ['meta',
            'disk_table',
            'types_table',
            'cdroms_table',
+           'mirrors_table',
            'autoinstalls_table',
            'Machine',
            'MachineAccess',
@@ -21,6 +22,7 @@ __all__ = ['meta',
            'Disk',
            'Type',
            'CDROM',
+           'Mirror',
            'Autoinstall',
            'or_',
            ]
@@ -62,9 +64,15 @@ types_table = Table('types', meta,
        Column('acpi', Boolean, nullable=False),
        Column('pae', Boolean, nullable=False))
 
+mirrors_table = Table('mirrors', meta,
+       Column('mirror_id', String, primary_key=True, nullable=False),
+       Column('uri_prefix', String, nullable=False))
+
 cdroms_table = Table('cdroms', meta,
        Column('cdrom_id', String, primary_key=True, nullable=False),
-       Column('description', String, nullable=False))
+       Column('description', String, nullable=False),
+       Column('mirror_id', String, ForeignKey('mirrors.mirror_id')),
+       Column('uri_suffix', String))
 
 autoinstalls_table = Table('autoinstalls', meta,
        Column('autoinstall_id', String, primary_key=True, nullable=False),
@@ -74,9 +82,9 @@ autoinstalls_table = Table('autoinstalls', meta,
        Column('mirror', String, nullable=False))
 
 machine_access_table = Table('machine_access', meta,
-       Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True),
+       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', ondelete='CASCADE'))
+       PrimaryKeyConstraint('machine_id', 'user'))
 
 class Machine(object):
     def __repr__(self):
@@ -98,6 +106,10 @@ class Type(object):
     def __repr__(self):
         return "<Type %s: %s>" % (self.type_id, self.description)
 
+class Mirror(object):
+    def __repr__(self):
+        return "<Mirror %s>" % (self.mirror_id)
+
 class CDROM(object):
     def __repr__(self):
         return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
@@ -115,14 +127,12 @@ session.mapper(MachineAccess, machine_access_table)
 session.mapper(NIC, nic_table)
 session.mapper(Disk, disk_table)
 session.mapper(Type, types_table)
+session.mapper(Mirror, mirrors_table)
 session.mapper(CDROM, cdroms_table)
 session.mapper(Autoinstall, autoinstalls_table)
 
 def clear_cache():
-    """Clear sqlalchemy's cache.
-
-    This _seems_ to be the way; it works, but the docs don't mention
-    it.  Why is this so obscure?"""
+    """Clear sqlalchemy's cache
+    """
 
-    # XXX maybe we still need to do this, but it's not doc'd how.
-    #ctx.registry.clear()
+    session.clear()