Fix get*Quotas

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

diff --git a/python/database/owner.py b/python/database/owner.py
index 4988bf3..ac8ecfd 100755 (executable)
--- a/python/database/owner.py
+++ b/python/database/owner.py
@@ -1,6 +1,7 @@
-from record import Record
+from invirt.database import record
+from invirt.database.models import session

 
 

-class Owner(Record):
+class Owner(record.Record):

     _f = {
         'ram_quota_total': (512, 'MiB'),
         'ram_quota_single': (512, 'MiB'),
     _f = {
         'ram_quota_total': (512, 'MiB'),
         'ram_quota_single': (512, 'MiB'),

@@ -17,21 +18,24 @@ class Owner(Record):
 
     @classmethod
     def getMemoryQuotas(cls, owner):
 
     @classmethod
     def getMemoryQuotas(cls, owner):

-        owner_info = cls.query().filter_by(owner_id=owner).first()
+        owner_info = cls.query().get(owner)

         if owner_info == None:
             owner_info = cls(owner_id=owner)
         if owner_info == None:
             owner_info = cls(owner_id=owner)

+            session.expunge(owner_info)

         return (owner_info.get('ram_quota_total'), owner_info.get('ram_quota_single'))
 
     @classmethod
     def getDiskQuotas(cls, owner):
         return (owner_info.get('ram_quota_total'), owner_info.get('ram_quota_single'))
 
     @classmethod
     def getDiskQuotas(cls, owner):

-        owner_info = cls.query().filter_by(owner_id=owner).first()
+        owner_info = cls.query().get(owner)

         if owner_info == None:
             owner_info = cls(owner_id=owner)
         if owner_info == None:
             owner_info = cls(owner_id=owner)

+            session.expunge(owner_info)

         return (owner_info.get('disk_quota_total'), owner_info.get('disk_quota_single'))
 
     @classmethod
     def getVMQuotas(cls, owner):
         return (owner_info.get('disk_quota_total'), owner_info.get('disk_quota_single'))
 
     @classmethod
     def getVMQuotas(cls, owner):

-        owner_info = cls.query().filter_by(owner_id=owner).first()
+        owner_info = cls.query().get(owner)

         if owner_info == None:
             owner_info = cls(owner_id=owner)
         if owner_info == None:
             owner_info = cls(owner_id=owner)

+            session.expunge(owner_info)

         return (owner_info.get('vms_quota_total'), owner_info.get('vms_quota_active'))
         return (owner_info.get('vms_quota_total'), owner_info.get('vms_quota_active'))