remove sfa upcalls

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

diff --git a/PLC/Methods/DeleteNode.py b/PLC/Methods/DeleteNode.py
index 0f07230..01e382a 100644 (file)
--- a/PLC/Methods/DeleteNode.py
+++ b/PLC/Methods/DeleteNode.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -24,15 +26,15 @@ class DeleteNode(Method):
 
     returns = Parameter(int, '1 if successful')
 
-
     def call(self, auth, node_id_or_hostname):
         # Get account information
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
-
         node = nodes[0]
-       PLCCheckLocalNode(node,"DeleteNode")
+
+        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.
@@ -43,7 +45,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()
-       self.object_ids = [node['node_id']]
+
+        # 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