Connect admin interface with backend for getting/setting quotas.

Fixes #1582

diff --git a/pithos/im/interface.py b/pithos/im/interface.py
new file mode 100644 (file)
index 0000000..6b3d029
--- /dev/null
+++ b/pithos/im/interface.py
@@ -0,0 +1,46 @@
+# Copyright 2011 GRNET S.A. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+# 
+#   1. Redistributions of source code must retain the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer.
+# 
+#   2. Redistributions in binary form must reproduce the above
+#      copyright notice, this list of conditions and the following
+#      disclaimer in the documentation and/or other materials
+#      provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and
+# documentation are those of the authors and should not be
+# interpreted as representing official policies, either expressed
+# or implied, of GRNET S.A.
+
+from pithos.backends import connect_backend
+
+def get_quota(user):
+    backend = connect_backend()
+    quota = backend.get_account_policy(user, user)['quota']
+    backend.close()
+    return quota
+
+def set_quota(user, quota):
+    backend = connect_backend()
+    backend.update_account_policy(user, user, {'quota': quota})
+    backend.close()
+    return quota

diff --git a/pithos/im/models.py b/pithos/im/models.py
index 226b4c3..3513194 100644 (file)
--- a/pithos/im/models.py
+++ b/pithos/im/models.py
@@ -41,6 +41,8 @@ from base64 import b64encode
 from django.conf import settings
 from django.db import models
 
+from pithos.im.interface import get_quota, set_quota
+
 
 class User(models.Model):
     ACCOUNT_STATE = (
@@ -79,11 +81,11 @@ class User(models.Model):
     
     @property
     def quota(self):
-        return settings.DEFAULT_QUOTA
+        return get_quota(self.uniq)
 
     @quota.setter
     def quota(self, value):
-        logging.debug('Set quota to: %s', value)
+        set_quota(self.uniq, value)
     
     def save(self, update_timestamps=True, **kwargs):
         if update_timestamps: