Fix get*Quotas

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

diff --git a/python/database/models.py b/python/database/models.py
index 02b5092..420c1ae 100644 (file)
--- a/python/database/models.py
+++ b/python/database/models.py
@@ -6,7 +6,6 @@ from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
 
 from invirt.database import record
 from sqlalchemy.ext.assignmapper import assign_mapper
 
 from invirt.database import record

-from invirt.database.owner import Owner

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

@@ -53,7 +52,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),

@@ -125,6 +125,8 @@ class CDROM(record.Record):
 class Autoinstall(record.Record):
     _identity_field = 'autoinstall_id'
 
 class Autoinstall(record.Record):
     _identity_field = 'autoinstall_id'
 

+from invirt.database.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"),