Revision 3549cb2f
| b/snf-cyclades-app/synnefo/api/ports.py | ||
|---|---|---|
| 83 | 83 |
|
| 84 | 84 |
log.debug('list_ports detail=%s', detail)
|
| 85 | 85 |
|
| 86 |
user_ports = NetworkInterface.objects.filter( |
|
| 87 |
machine__userid=request.user_uniq) |
|
| 86 |
user_ports = NetworkInterface.objects.filter(userid=request.user_uniq) |
|
| 88 | 87 |
|
| 89 | 88 |
port_dicts = [port_to_dict(port, detail) |
| 90 | 89 |
for port in user_ports.order_by('id')]
|
| b/snf-cyclades-app/synnefo/logic/subnets.py | ||
|---|---|---|
| 37 | 37 |
|
| 38 | 38 |
from django.conf import settings |
| 39 | 39 |
from django.db import transaction |
| 40 |
from django.db.models import Q |
|
| 41 |
|
|
| 40 | 42 |
from snf_django.lib import api |
| 41 | 43 |
from snf_django.lib.api import faults |
| 42 | 44 |
|
| ... | ... | |
| 57 | 59 |
|
| 58 | 60 |
def list_subnets(user_id): |
| 59 | 61 |
"""List all subnets of a user""" |
| 60 |
log.debug('list_subnets')
|
|
| 62 |
log.debug('list_subnets %s', user_id)
|
|
| 61 | 63 |
|
| 62 |
user_subnets = Subnet.objects.filter(network__userid=user_id) |
|
| 64 |
user_subnets = Subnet.objects.filter((Q(network__userid=user_id) & |
|
| 65 |
Q(network__public=False)) | |
|
| 66 |
Q(network__public=True)) |
|
| 63 | 67 |
return user_subnets |
| 64 | 68 |
|
| 65 | 69 |
|
Also available in: Unified diff