Fix an issue_commission calculation

The check for available capacity in the target entity
wouldn't account property for the initial quantity.

Make also the unit tests that failed to detect the problem
more robust.

snf-quotaholder-app/quotaholder_django/quotaholder_app/callpoint.py

@@ -750,10 +750,11 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
                                            current=current,
                                            limit=limit)
 
-                current = (+ th.importing + th.returning
+                limit = tp.quantity + tp.capacity
+                current = (+ th.importing + th.returning + tp.quantity
                            - th.exported - th.released)
 
-                if current + quantity > tp.quantity + tp.capacity:
+                if current + quantity > limit:
                     m = ("There is not enough capacity "
                          "to allocate into in %s.%s" % (target, resource))
                     raise NoCapacityError(m,

snf-quotaholder-app/quotaholder_django/test/simpletests.py

-# Copyright 2012 GRNET S.A. All rights reserved.
+# Copyright 2012, 2013 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -370,56 +370,56 @@ class QHAPITest(QHTestCase):
         self.new_quota(et1, kt1, resource, (0, 15, 3, 20))
         self.new_quota(et2, kt2, resource, (0, 15, 20, 20))
 
-        try:
+        with self.assertRaises(NoQuantityError) as cm:
             self.qh.issue_commission(clientkey=self.client, target=et1, key=kt1,
                                      name='something',
                                      provisions=[(es1, resource, 12)])
-        except NoQuantityError, e:
-            self.assertEqual(e.source, es1)
-            self.assertEqual(e.target, et1)
-            self.assertEqual(e.resource, resource)
-            self.assertEqual(e.limit, 10)
-            self.assertEqual(e.requested, 12)
-            self.assertEqual(e.current, 0)
-
-            r = self.qh.issue_commission(clientkey=self.client, target=et1,
-                                         key=kt1,
-                                         name='something',
-                                         provisions=[(es1, resource, 2)])
-            self.assertGreater(r, 0)
-
-        try:
+        e = cm.exception
+        self.assertEqual(e.source, es1)
+        self.assertEqual(e.target, et1)
+        self.assertEqual(e.resource, resource)
+        self.assertEqual(int(e.limit), 10)
+        self.assertEqual(int(e.requested), 12)
+        self.assertEqual(int(e.current), 0)
+
+        r = self.qh.issue_commission(clientkey=self.client, target=et1,
+                                     key=kt1,
+                                     name='something',
+                                     provisions=[(es1, resource, 2)])
+        self.assertGreater(r, 0)
+
+        with self.assertRaises(ImportLimitError) as cm:
             self.qh.issue_commission(clientkey=self.client, target=et1, key=kt1,
                                      name='something',
                                      provisions=[(es1, resource, 2)])
-        except ImportLimitError, e:
-            self.assertEqual(e.source, es1)
-            self.assertEqual(e.target, et1)
-            self.assertEqual(e.resource, resource)
-            self.assertEqual(e.limit, 3)
-            self.assertEqual(e.requested, 2)
-            self.assertEqual(e.current, 2)
-
-            r = self.qh.issue_commission(clientkey=self.client, target=et2,
-                                         key=kt2,
-                                         name='something',
-                                         provisions=[(es2, resource, 9)])
-            self.assertGreater(r, 0)
-
-        try:
+        e = cm.exception
+        self.assertEqual(e.source, es1)
+        self.assertEqual(e.target, et1)
+        self.assertEqual(e.resource, resource)
+        self.assertEqual(int(e.limit), 3)
+        self.assertEqual(int(e.requested), 2)
+        self.assertEqual(int(e.current), 2)
+
+        r = self.qh.issue_commission(clientkey=self.client, target=et2,
+                                     key=kt2,
+                                     name='something',
+                                     provisions=[(es2, resource, 9)])
+        self.assertGreater(r, 0)
+
+        with self.assertRaises(NoCapacityError) as cm:
             self.qh.issue_commission(clientkey=self.client, target=et2,
                                      key=kt2,
                                      name='something',
                                      provisions=[(es2, resource, 1),
-                                                 (es1, resource, 2)])
-        except NoCapacityError, e:
-            self.assertEqual(e.source, es1)
-            self.assertEqual(e.target, et2)
-            self.assertEqual(e.resource, resource)
-            self.assertEqual(e.limit, 10)
-            self.assertEqual(e.requested, 2)
-            # 9 actual + 1 from the first provision
-            self.assertEqual(e.current, 10)
+                                                 (es1, resource, 6)])
+        e = cm.exception
+        self.assertEqual(e.source, es1)
+        self.assertEqual(e.target, et2)
+        self.assertEqual(e.resource, resource)
+        self.assertEqual(int(e.limit), 15)
+        self.assertEqual(int(e.requested), 6)
+        # 9 actual + 1 from the first provision
+        self.assertEqual(int(e.current), 10)
 
 
     def test_010_list_holdings(self):