a slightly clearer version of GetSliceFamily

[plcapi.git] / PLC / Methods / DeleteNode.py

diff --git a/PLC/Methods/DeleteNode.py b/PLC/Methods/DeleteNode.py
index c4a2812..a819b24 100644 (file)
--- a/PLC/Methods/DeleteNode.py
+++ b/PLC/Methods/DeleteNode.py
@@ -29,9 +29,11 @@ class DeleteNode(Method):
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
-
         node = nodes[0]
 
+        if node['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local node"
+
         # If we are not an admin, make sure that the caller is a
         # member of the site at which the node is located.
         if 'admin' not in self.caller['roles']:
@@ -41,6 +43,13 @@ class DeleteNode(Method):
             if node['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Not allowed to delete nodes from specified site"
 
+        node_id=node['node_id']
+        site_id=node['site_id']
         node.delete()
 
+        # Logging variables
+        # it's not much use to attach to the node as it's going to vanish...
+        self.event_objects = {'Node': [node_id], 'Site': [site_id] }
+        self.message = "Node %d deleted" % node['node_id']
+
         return 1