Fixed yasb

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

diff --git a/python/database/models.py b/python/database/models.py
index 2944a1f..bd7f1cd 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',

@@ -87,7 +89,11 @@ autoinstalls_table = Table('autoinstalls', meta,
 owners_table = Table('owners', meta,
        Column('owner_id', String, primary_key=True, nullable=False),
        Column('ram_quota_total', Integer, nullable=True),
 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('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))

 
 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),

@@ -126,8 +132,6 @@ class Autoinstall(object):
     def __repr__(self):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 
     def __repr__(self):
         return "<Autoinstall %s: %s (%s)>" % (self.autoinstall_id, self.description, self.type.type_id)
 

-from owner import Owner
-

 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
                           'disks': relation(Disk, backref="machine"),
 session.mapper(Machine, machine_table,
               properties={'nics': relation(NIC, backref="machine"),
                           'disks': relation(Disk, backref="machine"),