Made some changes requested by Broder.

svn path=/trunk/packages/invirt-database/; revision=2135

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

@@ -130,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"),

diff --git a/python/database/owner.py b/python/database/owner.py
index b40dea5..f9e0128 100755 (executable)
--- a/python/database/owner.py
+++ b/python/database/owner.py
@@ -9,7 +9,13 @@ class Owner(object):
     def __repr__(self):
         return """<Owner %s: ram_quota_total=%s MB ram_quota_single=%s MB
 disk_quota_total=%s MB disk_quota_single=%s MB
     def __repr__(self):
         return """<Owner %s: ram_quota_total=%s MB ram_quota_single=%s MB
 disk_quota_total=%s MB disk_quota_single=%s MB

-vms_quota_total=%s vms_quota_active=%s >""" % (self.owner_id, self.ram_quota_total, self.ram_quota_single, self.disk_quota_total, self.disk_quota_single, self.vms_quota_total, self.vms_quota_active)
+vms_quota_total=%s vms_quota_active=%s >""" % (self.owner_id, 
+               self.ram_quota_total if self.ram_quota_total else MAX_MEMORY_TOTAL,
+               self.ram_quota_single if self.ram_quota_single else MAX_MEMORY_SINGLE, 
+               self.disk_quota_total if self.disk_quota_total else MAX_DISK_TOTAL,
+               self.disk_quota_single if self.disk_quota_single else MAX_DISK_SINGLE, 
+               self.vms_quota_total if self.vms_quota_total else MAX_VMS_TOTAL,
+               self.vms_quota_active if self.vms_quota_active else MAX_VMS_ACTIVE)

     def getMemoryQuotas(owner):
         owner_info = Owner.query().filter_by(owner_id=owner).first()
         if owner_info != None:
     def getMemoryQuotas(owner):
         owner_info = Owner.query().filter_by(owner_id=owner).first()
         if owner_info != None: