Revision 4b3b8688 snf-cyclades-app/synnefo/api/networks.py
| b/snf-cyclades-app/synnefo/api/networks.py | ||
|---|---|---|
| 110 | 110 |
log.debug('list_networks detail=%s', detail)
|
| 111 | 111 |
since = util.isoparse(request.GET.get('changes-since'))
|
| 112 | 112 |
user_networks = Network.objects.filter( |
| 113 |
Q(userid=request.user) | Q(public=True))
|
|
| 113 |
Q(userid=request.user_uniq) | Q(public=True))
|
|
| 114 | 114 |
|
| 115 | 115 |
if since: |
| 116 | 116 |
user_networks = user_networks.filter(updated__gte=since) |
| ... | ... | |
| 119 | 119 |
else: |
| 120 | 120 |
user_networks = user_networks.filter(state='ACTIVE') |
| 121 | 121 |
|
| 122 |
networks = [network_to_dict(network, request.user, detail) |
|
| 122 |
networks = [network_to_dict(network, request.user_uniq, detail)
|
|
| 123 | 123 |
for network in user_networks] |
| 124 | 124 |
|
| 125 | 125 |
if request.serialization == 'xml': |
| ... | ... | |
| 151 | 151 |
except (KeyError, ValueError): |
| 152 | 152 |
raise BadRequest('Malformed request.')
|
| 153 | 153 |
|
| 154 |
network = backend.create_network(name, request.user) |
|
| 154 |
network = backend.create_network(name, request.user_uniq)
|
|
| 155 | 155 |
if not network: |
| 156 | 156 |
raise OverLimit('Network count limit exceeded for your account.')
|
| 157 | 157 |
|
| 158 |
networkdict = network_to_dict(network, request.user) |
|
| 158 |
networkdict = network_to_dict(network, request.user_uniq)
|
|
| 159 | 159 |
return render_network(request, networkdict, status=202) |
| 160 | 160 |
|
| 161 | 161 |
|
| ... | ... | |
| 170 | 170 |
# overLimit (413) |
| 171 | 171 |
|
| 172 | 172 |
log.debug('get_network_details %s', network_id)
|
| 173 |
net = util.get_network(network_id, request.user) |
|
| 174 |
netdict = network_to_dict(net, request.user) |
|
| 173 |
net = util.get_network(network_id, request.user_uniq)
|
|
| 174 |
netdict = network_to_dict(net, request.user_uniq)
|
|
| 175 | 175 |
return render_network(request, netdict) |
| 176 | 176 |
|
| 177 | 177 |
|
| ... | ... | |
| 194 | 194 |
except (TypeError, KeyError): |
| 195 | 195 |
raise BadRequest('Malformed request.')
|
| 196 | 196 |
|
| 197 |
net = util.get_network(network_id, request.user) |
|
| 197 |
net = util.get_network(network_id, request.user_uniq)
|
|
| 198 | 198 |
if net.public: |
| 199 | 199 |
raise Unauthorized('Can not rename the public network.')
|
| 200 | 200 |
net.name = name |
| ... | ... | |
| 213 | 213 |
# overLimit (413) |
| 214 | 214 |
|
| 215 | 215 |
log.debug('delete_network %s', network_id)
|
| 216 |
net = util.get_network(network_id, request.user) |
|
| 216 |
net = util.get_network(network_id, request.user_uniq)
|
|
| 217 | 217 |
if net.public: |
| 218 | 218 |
raise Unauthorized('Can not delete the public network.')
|
| 219 | 219 |
backend.delete_network(net) |
| ... | ... | |
| 227 | 227 |
if len(req) != 1: |
| 228 | 228 |
raise BadRequest('Malformed request.')
|
| 229 | 229 |
|
| 230 |
net = util.get_network(network_id, request.user) |
|
| 230 |
net = util.get_network(network_id, request.user_uniq)
|
|
| 231 | 231 |
if net.public: |
| 232 | 232 |
raise Unauthorized('Can not modify the public network.')
|
| 233 | 233 |
|
Also available in: Unified diff