Be explicit about units in invirt-setquota.

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

diff --git a/python/database/models.py b/python/database/models.py
index 5c3a19a..f93557c 100644 (file)
--- 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
 
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 

+from owner import Owner
+

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

@@ -14,14 +16,18 @@ __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_',
            ]
 
            'or_',
            ]
 

@@ -36,7 +42,7 @@ 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('cpus', Integer, nullable=False, default=1),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
        Column('cpus', Integer, nullable=False, default=1),

@@ -77,7 +83,17 @@ autoinstalls_table = Table('autoinstalls', meta,
        Column('description', String, nullable=False),
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('distribution', String, 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,
        Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
 
 machine_access_table = Table('machine_access', meta,
        Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),

@@ -117,17 +133,19 @@ class Autoinstall(object):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
 session.mapper(Machine, machine_table,
         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", 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")});
+              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(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(CDROM, cdroms_table,
+               properties={'mirror': relation(Mirror, backref="cdroms")})

 session.mapper(Autoinstall, autoinstalls_table)
 session.mapper(Autoinstall, autoinstalls_table)

+session.mapper(Owner, owners_table)

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