Revision b6bc4afa snf-cyclades-app/synnefo/api/floating_ips.py
| b/snf-cyclades-app/synnefo/api/floating_ips.py | ||
|---|---|---|
| 92 | 92 |
log.debug("list_floating_ips")
|
| 93 | 93 |
|
| 94 | 94 |
userid = request.user_uniq |
| 95 |
floating_ips = FloatingIP.objects.filter(userid=userid, deleted=False)\
|
|
| 96 |
.order_by("id")
|
|
| 95 |
floating_ips = FloatingIP.objects.filter(userid=userid).order_by("id")
|
|
| 96 |
floating_ips = utils.filter_modified_since(request, objects=floating_ips)
|
|
| 97 | 97 |
|
| 98 | 98 |
floating_ips = map(ip_to_dict, floating_ips) |
| 99 | 99 |
|
| ... | ... | |
| 231 | 231 |
@api.api_method(http_method='GET', user_required=True, logger=log, |
| 232 | 232 |
serializations=["json"]) |
| 233 | 233 |
def list_floating_ip_pools(request): |
| 234 |
networks = Network.objects.filter(public=True, deleted=False,
|
|
| 235 |
floating_ip_pool=True)
|
|
| 234 |
networks = Network.objects.filter(public=True, floating_ip_pool=True)
|
|
| 235 |
networks = utils.filter_modified_since(request, objects=networks)
|
|
| 236 | 236 |
pools = [{"name": str(net.id)} for net in networks]
|
| 237 | 237 |
request.serialization = "json" |
| 238 | 238 |
data = json.dumps({"floating_ip_pools": pools})
|
Also available in: Unified diff