cosmetic change

[invirt/packages/invirt-database.git] / python / database / models.py

diff --git a/python/database/models.py b/python/database/models.py
index ee207f6..6b53a2a 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -1,10 +1,15 @@
 from sqlalchemy import *
 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
 
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 

+from record import *
+from owner import Owner
+

 __all__ = ['meta',
 __all__ = ['meta',

-           'ctx',
+           'session',

            'clear_cache',
            'machine_table',
            'machine_access_table',
            'clear_cache',
            'machine_table',
            'machine_access_table',

@@ -12,18 +17,23 @@ __all__ = ['meta',
            'disk_table',
            'types_table',
            'cdroms_table',
            'disk_table',
            'types_table',
            'cdroms_table',

+           'mirrors_table',

            'autoinstalls_table',
            'autoinstalls_table',

+           'owners_table',

            'Machine',
            'MachineAccess',
            'NIC',
            'Disk',
            'Type',
            'CDROM',
            'Machine',
            'MachineAccess',
            'NIC',
            'Disk',
            'Type',
            'CDROM',

+           'Mirror',

            'Autoinstall',
            'Autoinstall',

+           'Owner',
+           'or_',

            ]
 
            ]
 

-meta = DynamicMetaData()
-ctx = SessionContext(create_session)
+meta = ThreadLocalMetaData()
+session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))

 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),
 
 machine_table = Table('machines', meta,
        Column('machine_id', Integer, primary_key=True, nullable=False),

@@ -33,10 +43,11 @@ machine_table = Table('machines', meta,
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),
        Column('owner', String, nullable=False),
        Column('contact', String, nullable=False),
        Column('uuid', String, nullable=False),

-       Column('administrator', String, nullable=False, default=False),
+       Column('administrator', String, nullable=True, default=None),

        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),

-       Column('cpus', Integer, nullable=False, default=1))
+       Column('cpus', Integer, nullable=False, default=1),
+       Column('adminable', Boolean, nullable=False, default=False))

 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),
 
 nic_table = Table('nics', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=True),

@@ -58,66 +69,79 @@ types_table = Table('types', meta,
        Column('acpi', Boolean, nullable=False),
        Column('pae', Boolean, nullable=False))
 
        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),
 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),
        Column('description', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),
 
 autoinstalls_table = Table('autoinstalls', meta,
        Column('autoinstall_id', String, primary_key=True, nullable=False),
        Column('description', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),

-       Column('mirror', String, nullable=False))
+       Column('mirror', String, nullable=False),
+       Column('arch', String, nullable=False))
+
+owners_table = Table('owners', meta,
+       Column('owner_id', String, primary_key=True, nullable=False),
+       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,
 
 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),
        Column('user', String, nullable=False, index=True),

-       PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE'))
-
-class Machine(object):
-    def __repr__(self):
-        return "<Machine %s: name='%s' owner='%s'>" % (self.machine_id, self.name, self.owner)
-
-class MachineAccess(object):
-    def __repr__(self):
-        return "<MachineAccess machine='%s' user='%s'>" % (self.machine, self.user)
-
-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(object):
-    def __repr__(self):
-        return "<Disk: machine=%s device=%s size=%s>" % (self.machine_id, self.guest_device_name, self.size)
-
-class Type(object):
-    def __repr__(self):
-        return "<Type %s: %s>" % (self.type_id, self.description)
-
-class CDROM(object):
-    def __repr__(self):
-        return "<CDROM %s: %s>" % (self.cdrom_id, self.description)
-
-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,
-              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)
+       PrimaryKeyConstraint('machine_id', 'user'))

 
 

-def clear_cache():
-    """Clear sqlalchemy's cache.
+class Machine(Record):
+    _identity_field = 'name'
+
+class MachineAccess(Record):
+    pass
+
+class NIC(Record):
+    pass
+
+class Disk(Record):
+    pass

 
 

-    This _seems_ to be the way; it works, but the docs don't mention
-    it.  Why is this so obscure?"""
+class Type(Record):
+    _identity_field = 'type_id'
+
+class Mirror(Record):
+    _identity_field = 'mirror_id'
+
+class CDROM(Record):
+    _identity_field = 'cdrom_id'
+
+class Autoinstall(Record):
+    _identity_field = 'autoinstall_id'
+
+session.mapper(Machine, machine_table,
+              properties={'nics': relation(NIC, backref="machine"),
+                          'disks': relation(Disk, backref="machine"),
+                          'type': relation(Type),
+                          'acl': relation(MachineAccess, backref="machine", passive_deletes=True, cascade="all, delete-orphan")});
+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,
+               properties={'mirror': relation(Mirror, backref="cdroms")})
+session.mapper(Autoinstall, autoinstalls_table)
+session.mapper(Owner, owners_table)
+
+def clear_cache():
+    """Clear sqlalchemy's cache
+    """

 
 

-    ctx.registry.clear()
+    session.clear()