X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/fe3cf67c45ba77d082eeadfc191d627b43373cc1..4fc8b53bdc8a05d9f1e1a0d079d558b50367ebef:/python/database/models.py?ds=sidebyside

diff --git a/python/database/models.py b/python/database/models.py
index 6574ff1..52bd7c1 100644
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -1,11 +1,12 @@
 from sqlalchemy import *
+from sqlalchemy import orm
 from sqlalchemy.orm import create_session, relation
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
 __all__ = ['meta',
-           'ctx',
+           'session',
            'clear_cache',
            'machine_table',
            'machine_access_table',
@@ -25,7 +26,7 @@ __all__ = ['meta',
            ]
 
 meta = ThreadLocalMetaData()
-ctx = SessionContext(create_session)
+session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
@@ -61,9 +62,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),
@@ -73,9 +80,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):
@@ -97,6 +104,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)
@@ -105,22 +116,21 @@ class Autoinstall(object):
     def __repr__(self):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
-assign_mapper(ctx, Machine, machine_table,
+session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine", lazy=False),
                           'disks': relation(Disk, backref="machine", lazy=False),
                           'type': relation(Type, lazy=False),
                           'acl': relation(MachineAccess, backref="machine", lazy=False, passive_deletes=True, cascade="all, delete-orphan")});
-assign_mapper(ctx, MachineAccess, machine_access_table)
-assign_mapper(ctx, NIC, nic_table)
-assign_mapper(ctx, Disk, disk_table)
-assign_mapper(ctx, Type, types_table)
-assign_mapper(ctx, CDROM, cdroms_table)
-assign_mapper(ctx, Autoinstall, autoinstalls_table)
+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
+    """
 
-    ctx.registry.clear()
+    session.clear()