X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteNodeFromPCU.py;h=3f408dad7eebf01c58bded4492c3115f4d6db2e0;hb=f5b0dff0ebde4366af74ae6a0d894bf7893f95f4;hp=02ddfcc5a042654d03f61c17a572f8679d2a4201;hpb=3f30de17c58880c0f6f1d64ea573c3fe56e32a38;p=plcapi.git

diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py
index 02ddfcc..3f408da 100644
--- a/PLC/Methods/DeleteNodeFromPCU.py
+++ b/PLC/Methods/DeleteNodeFromPCU.py
@@ -1,8 +1,11 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.PCUs import PCU, PCUs
+from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
 
 class DeleteNodeFromPCU(Method):
@@ -18,18 +21,15 @@ class DeleteNodeFromPCU(Method):
 
     accepts = [
         Auth(),
-	Mixed(Node.fields['node_id'],
+        Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
         PCU.fields['pcu_id']
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'DeleteFrom'
-    object_type = 'PCU'
-
     def call(self, auth, node_id_or_hostname, pcu_id):
-	 # Get node
+         # Get node
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
@@ -52,11 +52,16 @@ class DeleteNodeFromPCU(Method):
                     break
             if not ok:
                 raise PLCPermissionDenied, "Not allowed to update that PCU"
-	
-	# Removed node from PCU
+
+        # Removed node from PCU
+
         if node['node_id'] in pcu['node_ids']:
             pcu.remove_node(node)
 
-	self.object_ids = [pcu['pcu_id']]
-        
-	return 1
+        # Logging variables
+        self.event_objects = {'PCU': [pcu['pcu_id']],
+                              'Node': [node['node_id']]}
+        self.message = 'Node %d removed from PCU %d' % \
+                (node['node_id'], pcu['pcu_id'])
+
+        return 1