Revision a1623327 snf-cyclades-app/synnefo/quotas/__init__.py

b/snf-cyclades-app/synnefo/quotas/__init__.py
308 308 
        if action == "BUILD":
309 309 
            new_volumes = resource.volumes.filter(status="CREATING")
310 310 
            new_volumes_size = new_volumes.aggregate(Sum("size"))["size__sum"]
311 
            resources["cyclades.disk"] = new_volumes_size << 30
311 
            resources["cyclades.disk"] = int(new_volumes_size) << 30
312 312 
            resources.update(online_resources)
313 313 
            return resources
314 314 
        if action == "START":
......
329 329 
        elif action == "DESTROY":
330 330 
            volumes = resource.volumes.filter(deleted=False)
331 331 
            volumes_size = volumes.aggregate(Sum("size"))["size__sum"]
332 
            resources["cyclades.disk"] = volumes_size << 30
333 
            resources.update(online_resources)
332 
            if volumes_size is None:
333 
                volumes_size = 0
334 
            resources["cyclades.disk"] = int(volumes_size) << 30
334 335 
            if resource.operstate in ["STARTED", "BUILD", "ERROR"]:
335 336 
                resources.update(online_resources)
336 337 
            return reverse_quantities(resources)

Also available in: Unified diff