Use the new bootcd's build.sh script, which does not need root.

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

diff --git a/PLC/Methods/DeleteNode.py b/PLC/Methods/DeleteNode.py
index c998bdc..bc92718 100644 (file)
--- a/PLC/Methods/DeleteNode.py
+++ b/PLC/Methods/DeleteNode.py
@@ -24,15 +24,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.
@@ -46,7 +46,7 @@ class DeleteNode(Method):
         node.delete()
 
        # Logging variables
-       self.object_ids = [node['node_id']]
+       self.event_objects = {'Node': [node['node_id']]}
        self.message = "Node %d deleted" % node['node_id']
 
         return 1