more API updates

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

diff --git a/python/database/models.py b/python/database/models.py
index bd7f1cd..dc87e3b 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -2,10 +2,25 @@ from sqlalchemy import *
 from sqlalchemy import orm
 from sqlalchemy.orm import create_session, relation
 
 from sqlalchemy import orm
 from sqlalchemy.orm import create_session, relation
 

-from sqlalchemy.ext.sessioncontext import SessionContext
-from sqlalchemy.ext.assignmapper import assign_mapper
+import datetime
+
+from invirt.database import record
+
+# Compatibility hack from
+# http://www.sqlalchemy.org/trac/wiki/UsageRecipes/SessionAwareMapper
+from sqlalchemy.orm import mapper as sqla_mapper
+
+def session_mapper(scoped_session):
+    def mapper(cls, *arg, **kw):
+        if cls.__init__ is object.__init__:
+            def __init__(self, **kwargs):
+                for key, value in kwargs.items():
+                    setattr(self, key, value)
+            cls.__init__ = __init__
+        cls.query = scoped_session.query_property()
+        return sqla_mapper(cls, *arg, **kw)
+    return mapper

 
 

-from owner import Owner

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

@@ -19,6 +34,8 @@ __all__ = ['meta',
            'mirrors_table',
            'autoinstalls_table',
            'owners_table',
            'mirrors_table',
            'autoinstalls_table',
            'owners_table',

+           'admins_table',
+           'builds_table',

            'Machine',
            'MachineAccess',
            'NIC',
            'Machine',
            'MachineAccess',
            'NIC',

@@ -28,15 +45,17 @@ __all__ = ['meta',
            'Mirror',
            'Autoinstall',
            'Owner',
            'Mirror',
            'Autoinstall',
            'Owner',

+           'Admin',
+           'Build',

            'or_',
            ]
 
 meta = ThreadLocalMetaData()
            'or_',
            ]
 
 meta = ThreadLocalMetaData()

-session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=False))
+session = orm.scoped_session(orm.sessionmaker(autocommit=True, 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),

-       Column('name', String, nullable=False),
+       Column('name', String, nullable=False, unique=True),

        Column('description', String, nullable=False),
        Column('memory', Integer, nullable=False),
        Column('owner', String, nullable=False),
        Column('description', String, nullable=False),
        Column('memory', Integer, nullable=False),
        Column('owner', String, nullable=False),

@@ -52,7 +71,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('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),
 
 disk_table = Table('disks', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False),

@@ -84,68 +104,87 @@ autoinstalls_table = Table('autoinstalls', meta,
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),
        Column('mirror', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, nullable=False),
        Column('mirror', String, nullable=False),

-       Column('arch', String, nullable=False))
+       Column('arch', String, nullable=False),
+       Column('preseed', Boolean, nullable=False, default=False))

 
 owners_table = Table('owners', meta,
        Column('owner_id', String, primary_key=True, nullable=False),
 
 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))
+
+builds_table = Table('builds', meta,
+       Column('build_id', Integer, primary_key=True, nullable=False),
+       Column('package', String, nullable=False),
+       Column('pocket', String, nullable=False),
+       Column('commit', String, nullable=False),
+       Column('version', String, nullable=True, default=None),
+       Column('principal', String, nullable=False),
+       Column('succeeded', Boolean, nullable=True),
+       Column('failed_stage', String, nullable=True, default=None),
+       Column('traceback', String, nullable=True, default=None),
+       Column('inserted_at', DateTime, nullable=False, default=datetime.datetime.utcnow))

 
 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'))
 
 
 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 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 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)
-
-class Autoinstall(object):
-    def __repr__(self):
-        return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_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)
+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 NIC(record.Record):
+    pass
+
+class Disk(record.Record):
+    pass
+
+class Type(record.Record):
+    _identity_field = 'type_id'
+
+class Mirror(record.Record):
+    _identity_field = 'mirror_id'
+
+class CDROM(record.Record):
+    _identity_field = 'cdrom_id'
+
+class Autoinstall(record.Record):
+    _identity_field = 'autoinstall_id'
+
+class Admin(record.Record):
+    _identity_field = 'user'
+
+class Build(record.Record):
+    _identity_field = 'build_id'
+
+from invirt.database.owner import Owner
+mapper = session_mapper(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")});
+mapper(MachineAccess, machine_access_table)
+mapper(NIC, nic_table)
+mapper(Disk, disk_table)
+mapper(Type, types_table)
+mapper(Mirror, mirrors_table)
+mapper(CDROM, cdroms_table,
+       properties={'mirror': relation(Mirror, backref="cdroms")})
+mapper(Autoinstall, autoinstalls_table)
+mapper(Owner, owners_table)
+mapper(Admin, admins_table)
+mapper(Build, builds_table)

 
 def clear_cache():
     """Clear sqlalchemy's cache
 
 def clear_cache():
     """Clear sqlalchemy's cache