Revision 8b41683a snf-cyclades-app/synnefo/quotas/__init__.py

b/snf-cyclades-app/synnefo/quotas/__init__.py
31 31
from django.db import transaction
32 32

  
33 33
from snf_django.lib.api import faults
34
from synnefo.db.models import QuotaHolderSerial, VirtualMachine, Network
34
from synnefo.db.models import (QuotaHolderSerial, VirtualMachine, Network,
35
                               FloatingIP)
35 36

  
36 37
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
37 38
                              ASTAKOS_BASE_URL)
......
50 51
    "cyclades.disk",
51 52
    "cyclades.ram",
52 53
    "cyclades.active_ram",
53
    "cyclades.network.private"
54
    "cyclades.network.private",
55
    "cyclades.floating_ip",
54 56
]
55 57

  
56 58

  
......
194 196
    resource_name = {"vm": "Virtual Machine",
195 197
                     "cpu": "CPU",
196 198
                     "ram": "RAM",
197
                     "network.private": "Private Network"}
199
                     "network.private": "Private Network",
200
                     "floating_ip": "Floating IP address"}
198 201
    details = json.loads(e.details)
199 202
    data = details['overLimit']['data']
200 203
    usage = data["usage"]
......
291 294
                'cyclades.active_ram': 1048576 * flavor.ram}
292 295
    elif isinstance(resource, Network):
293 296
        return {"cyclades.network.private": 1}
297
    elif isinstance(resource, FloatingIP):
298
        return {"cyclades.floating_ip": 1}
294 299
    else:
295 300
        raise ValueError("Unknown Resource '%s'" % resource)
296 301

  

Also available in: Unified diff