wip Remove dependency from commissioning

Define exceptions locally

snf-astakos-app/astakos/quotaholder/api.py

+QH_PRACTICALLY_INFINITE =   10**32

snf-astakos-app/astakos/quotaholder/callpoint.py

@@ -31,20 +31,18 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from synnefo.lib.quotaholder.api import (
-    QuotaholderAPI,
-    QH_PRACTICALLY_INFINITE,
+from astakos.quotaholder.exception import (
+    QuotaholderError,
+    CorruptedError, InvalidDataError,
     InvalidKeyError, NoEntityError,
     NoQuantityError, NoCapacityError,
     ExportLimitError, ImportLimitError,
     DuplicateError)
 
-from synnefo.lib.commissioning import (
-    Callpoint, CorruptedError, InvalidDataError, ReturnButFail)
-from synnefo.lib.commissioning.utils.newname import newname
+from astakos.quotaholder.utils.newname import newname
+from astakos.quotaholder.api import QH_PRACTICALLY_INFINITE
 
 from django.db.models import Q, Count
-from django.db import transaction
 from .models import (Entity, Policy, Holding,
                      Commission, Provision, ProvisionLog, CallSerial,
                      now,
@@ -52,28 +50,7 @@ from .models import (Entity, Policy, Holding,
                      db_get_commission, db_filter_provision, db_get_callserial)
 
 
-class QuotaholderDjangoDBCallpoint(Callpoint):
-
-    api_spec = QuotaholderAPI()
-
-    def init_connection(self, connection):
-        if connection is not None:
-            raise ValueError("Cannot specify connection args with %s" %
-                             type(self).__name__)
-
-    def commit(self):
-        transaction.commit()
-
-    def rollback(self):
-        transaction.rollback()
-
-    def do_make_call(self, call_name, data):
-        call_fn = getattr(self, call_name, None)
-        if not call_fn:
-            m = "cannot find call '%s'" % (call_name,)
-            raise CorruptedError(m)
-
-        return call_fn(**data)
+class QuotaholderDjangoDBCallpoint(object):
 
     def create_entity(self, context=None, create_entity=()):
         rejected = []
@@ -95,7 +72,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
                                           key=key)
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def set_entity_key(self, context=None, set_entity_key=()):
@@ -113,7 +90,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
             e.save()
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def list_entities(self, context=None, entity=None, key=None):
@@ -233,7 +210,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
                                            policy=p, flags=flags)
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def _init_holding(self,
@@ -287,7 +264,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
                                returned, released,
                                flags)
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def reset_holding(self, context=None, reset_holding=()):
@@ -320,7 +297,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
                 continue
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def _check_pending(self, entity, resource):
@@ -384,7 +361,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
             h.delete()
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def list_resources(self, context=None, entity=None, key=None):
@@ -507,7 +484,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
         objs.filter(policy__in=old_policies, refs=0).delete()
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def add_quota(self,
@@ -519,11 +496,11 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
         if serial is not None:
             if clientkey is None:
                 all_pairs = [(q[0], q[1]) for q in sub_quota + add_quota]
-                raise ReturnButFail(all_pairs)
+                raise QuotaholderError(all_pairs)
             try:
                 cs = CallSerial.objects.get(serial=serial, clientkey=clientkey)
                 all_pairs = [(q[0], q[1]) for q in sub_quota + add_quota]
-                raise ReturnButFail(all_pairs)
+                raise QuotaholderError(all_pairs)
             except CallSerial.DoesNotExist:
                 pass
 
@@ -601,7 +578,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
         objs.filter(policy__in=old_policies, refs=0).delete()
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
 
         if serial is not None and clientkey is not None:
             CallSerial.objects.create(serial=serial, clientkey=clientkey)
@@ -998,7 +975,7 @@ class QuotaholderDjangoDBCallpoint(Callpoint):
             e.delete()
 
         if rejected:
-            raise ReturnButFail(rejected)
+            raise QuotaholderError(rejected)
         return rejected
 
     def get_timeline(self, context=None, after="", before="Z", get_timeline=()):

snf-astakos-app/astakos/quotaholder/exception.py

+# 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
+# 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.
+
+
+class QuotaholderError(Exception):
+    pass
+
+
+
+class InvalidKeyError(QuotaholderError):
+    pass
+
+
+class NoEntityError(QuotaholderError):
+    pass
+
+
+class CorruptedError(QuotaholderError):
+    pass
+
+
+class InvalidDataError(QuotaholderError):
+    pass
+
+
+class CommissionException(QuotaholderError):
+    pass
+
+
+class CommissionValueException(CommissionException):
+    def __init__(self, *args, **kwargs):
+
+        self.source    = kwargs['source']
+        self.target    = kwargs['target']
+        self.resource  = kwargs['resource']
+        self.requested = kwargs['requested']
+        self.current   = kwargs['current']
+        self.limit     = kwargs['limit']
+
+
+class NoQuantityError(CommissionValueException):
+    pass
+
+
+class NoCapacityError(CommissionValueException):
+    pass
+
+
+class ExportLimitError(CommissionValueException):
+    pass
+
+
+class ImportLimitError(CommissionValueException):
+    pass
+
+
+class DuplicateError(CommissionException):
+    pass

snf-astakos-app/astakos/quotaholder/models.py

@@ -32,7 +32,6 @@
 # or implied, of GRNET S.A.
 
 
-from synnefo.lib.commissioning import CorruptedError
 from synnefo.lib.db.intdecimalfield import intDecimalField
 
 from django.db.models import (Model, BigIntegerField, CharField,

snf-astakos-app/astakos/quotaholder/utils/newname.py

+# 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
+# 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 time import time
+
+_counter = 0
+
+def newname(prefix):
+    global _counter;
+    _counter += 1
+    ident = id(locals())
+    nonce = int(time() * 1000) + _counter
+    return "%s%x%x" % (prefix, ident, nonce)