Revision 83a99fbb snf-cyclades-app/synnefo/neutron/network_views.py
| b/snf-cyclades-app/synnefo/neutron/network_views.py | ||
|---|---|---|
| 47 | 47 |
|
| 48 | 48 |
|
| 49 | 49 |
@api.api_method(http_method='GET', user_required=True, logger=log) |
| 50 |
def list_networks(request): |
|
| 51 |
log.debug('list_networks')
|
|
| 50 |
def list_networks(request, detail=False):
|
|
| 51 |
log.debug('list_networks detail=%s', detail)
|
|
| 52 | 52 |
|
| 53 | 53 |
user_networks = Network.objects.filter( |
| 54 | 54 |
Q(userid=request.user_uniq) | Q(public=True)) |
| 55 | 55 |
|
| 56 |
user_networks = user_networks.filter(deleted=False)
|
|
| 56 |
user_networks = utils.filter_modified_since(request, objects=user_networks)
|
|
| 57 | 57 |
|
| 58 |
networks = [network_to_dict(network) |
|
| 58 |
networks = [network_to_dict(network, detail)
|
|
| 59 | 59 |
for network in user_networks.order_by('id')]
|
| 60 | 60 |
|
| 61 | 61 |
if request.serialization == 'xml': |
| ... | ... | |
| 225 | 225 |
return render_network(request, netdict, 200) |
| 226 | 226 |
|
| 227 | 227 |
|
| 228 |
def network_to_dict(network): |
|
| 228 |
def network_to_dict(network, detail=True):
|
|
| 229 | 229 |
d = {'id': str(network.id), 'name': network.name}
|
| 230 | 230 |
d['links'] = util.network_to_links(network.id) |
| 231 |
d['user_id'] = network.userid |
|
| 232 |
d['tenant_id'] = network.userid |
|
| 233 |
d['type'] = network.flavor |
|
| 234 |
d['updated'] = utils.isoformat(network.updated) |
|
| 235 |
d['created'] = utils.isoformat(network.created) |
|
| 236 |
d['status'] = network.state |
|
| 237 |
d['public'] = network.public |
|
| 238 |
d['admin_state_up'] = "true" |
|
| 239 |
subnet_cidr = [s.id for s in network.subnet_set.all()] |
|
| 240 |
d['subnets'] = subnet_cidr |
|
| 231 |
if detail: |
|
| 232 |
d['user_id'] = network.userid |
|
| 233 |
d['tenant_id'] = network.userid |
|
| 234 |
d['type'] = network.flavor |
|
| 235 |
d['updated'] = utils.isoformat(network.updated) |
|
| 236 |
d['created'] = utils.isoformat(network.created) |
|
| 237 |
d['status'] = network.state |
|
| 238 |
d['public'] = network.public |
|
| 239 |
d['admin_state_up'] = "true" |
|
| 240 |
subnet_cidr = [s.subnet_id for s in network.subnet_set.all()] |
|
| 241 |
d['subnets'] = subnet_cidr |
|
| 241 | 242 |
return d |
| 242 | 243 |
|
| 243 | 244 |
|
Also available in: Unified diff