Revision 22a9959d
b/snf-cyclades-app/synnefo/api/networks.py | ||
---|---|---|
254 | 254 |
net = util.get_network(network_id, request.user_uniq) |
255 | 255 |
if net.public: |
256 | 256 |
raise Unauthorized('Can not rename the public network.') |
257 |
if net.deleted: |
|
258 |
raise Network.DeletedError |
|
257 | 259 |
net.name = name |
258 | 260 |
net.save() |
259 | 261 |
return HttpResponse(status=204) |
... | ... | |
275 | 277 |
if net.public: |
276 | 278 |
raise Unauthorized('Can not delete the public network.') |
277 | 279 |
|
280 |
if net.deleted: |
|
281 |
raise Network.DeletedError |
|
282 |
|
|
278 | 283 |
if net.machines.all(): # Nics attached on network |
279 | 284 |
raise NetworkInUse('Machines are connected to network.') |
280 | 285 |
|
286 |
|
|
281 | 287 |
net.action = 'DESTROY' |
282 | 288 |
net.save() |
283 | 289 |
|
... | ... | |
295 | 301 |
net = util.get_network(network_id, request.user_uniq) |
296 | 302 |
if net.public: |
297 | 303 |
raise Unauthorized('Can not modify the public network.') |
304 |
if net.deleted: |
|
305 |
raise Network.DeletedError |
|
298 | 306 |
|
299 | 307 |
key = req.keys()[0] |
300 | 308 |
val = req[key] |
b/snf-cyclades-app/synnefo/api/util.py | ||
---|---|---|
393 | 393 |
except VirtualMachine.DeletedError: |
394 | 394 |
fault = BadRequest('Server has been deleted.') |
395 | 395 |
return render_fault(request, fault) |
396 |
except Network.DeletedError: |
|
397 |
fault = BadRequest('Network has been deleted.') |
|
398 |
return render_fault(request, fault) |
|
396 | 399 |
except VirtualMachine.BuildingError: |
397 | 400 |
fault = BuildInProgress('Server is being built.') |
398 | 401 |
return render_fault(request, fault) |
b/snf-cyclades-app/synnefo/db/models.py | ||
---|---|---|
460 | 460 |
def __str__(self): |
461 | 461 |
return repr(str(self._action)) |
462 | 462 |
|
463 |
class DeletedError(Exception): |
|
464 |
pass |
|
465 |
|
|
463 | 466 |
@property |
464 | 467 |
def backend_id(self): |
465 | 468 |
"""Return the backend id by prepending backend-prefix.""" |
Also available in: Unified diff