Changeset 2135 for trunk/packages/invirt-database

Timestamp:

Feb 17, 2009, 2:16:12 AM (16 years ago)

Author:

iannucci

Message:

Made some changes requested by Broder.

Location:

trunk/packages/invirt-database/python/database

Files:

• models.py (modified) (2 diffs)
• owner.py (modified) (1 diff)

trunk/packages/invirt-database/python/database/models.py

@@ -5 +5 @@
 from sqlalchemy.ext.sessioncontext import SessionContext
 from sqlalchemy.ext.assignmapper import assign_mapper
+
+from owner import Owner
 
 __all__ = ['meta',
@@ -131 +133 @@
         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"),

trunk/packages/invirt-database/python/database/owner.py

@@ -10 +10 @@
         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()