Do not allow actions to deleted networks

snf-cyclades-app/synnefo/api/networks.py

@@ -254,6 +254,8 @@ def update_network_name(request, network_id):
     net = util.get_network(network_id, request.user_uniq)
     if net.public:
         raise Unauthorized('Can not rename the public network.')
+    if net.deleted:
+        raise Network.DeletedError
     net.name = name
     net.save()
     return HttpResponse(status=204)
@@ -275,9 +277,13 @@ def delete_network(request, network_id):
     if net.public:
         raise Unauthorized('Can not delete the public network.')
 
+    if net.deleted:
+        raise Network.DeletedError
+
     if net.machines.all():  # Nics attached on network
         raise NetworkInUse('Machines are connected to network.')
 
+
     net.action = 'DESTROY'
     net.save()
 
@@ -295,6 +301,8 @@ def network_action(request, network_id):
     net = util.get_network(network_id, request.user_uniq)
     if net.public:
         raise Unauthorized('Can not modify the public network.')
+    if net.deleted:
+        raise Network.DeletedError
 
     key = req.keys()[0]
     val = req[key]

snf-cyclades-app/synnefo/api/util.py

@@ -393,6 +393,9 @@ def api_method(http_method=None, atom_allowed=False):
             except VirtualMachine.DeletedError:
                 fault = BadRequest('Server has been deleted.')
                 return render_fault(request, fault)
+            except Network.DeletedError:
+                fault = BadRequest('Network has been deleted.')
+                return render_fault(request, fault)
             except VirtualMachine.BuildingError:
                 fault = BuildInProgress('Server is being built.')
                 return render_fault(request, fault)

snf-cyclades-app/synnefo/db/models.py

@@ -460,6 +460,9 @@ class Network(models.Model):
         def __str__(self):
             return repr(str(self._action))
 
+    class DeletedError(Exception):
+        pass
+
     @property
     def backend_id(self):
         """Return the backend id by prepending backend-prefix."""