X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/476d485a554bedcf216a7075560922156a90ba67..25328953b0d7404f6aeb1ebaffd09ef318049024:/python/database/models.py diff --git a/python/database/models.py b/python/database/models.py index 25d5f77..c1b31b6 100644 --- a/python/database/models.py +++ b/python/database/models.py @@ -5,6 +5,8 @@ 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 __all__ = ['meta', @@ -20,6 +22,7 @@ __all__ = ['meta', 'autoinstalls_table', 'owners_table', 'admins_table', + 'builds_table', 'Machine', 'MachineAccess', 'NIC', @@ -30,6 +33,7 @@ __all__ = ['meta', 'Autoinstall', 'Owner', 'Admin', + 'Build', 'or_', ] @@ -38,7 +42,7 @@ session = orm.scoped_session(orm.sessionmaker(transactional=False, autoflush=Fal 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), @@ -87,7 +91,8 @@ 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('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), @@ -98,6 +103,18 @@ owners_table = Table('owners', meta, 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), @@ -133,6 +150,9 @@ class Autoinstall(record.Record): class Admin(record.Record): _identity_field = 'user' +class Build(record.Record): + _identity_field = 'build_id' + from invirt.database.owner import Owner session.mapper(Machine, machine_table, @@ -150,6 +170,7 @@ session.mapper(CDROM, cdroms_table, session.mapper(Autoinstall, autoinstalls_table) session.mapper(Owner, owners_table) session.mapper(Admin, admins_table) +session.mapper(Build, builds_table) def clear_cache(): """Clear sqlalchemy's cache