svn keywords

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

diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py
index 02ddfcc..5cf00f7 100644 (file)
--- 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):
@@ -25,9 +28,6 @@ class DeleteNodeFromPCU(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'DeleteFrom'
-    object_type = 'PCU'
-
     def call(self, auth, node_id_or_hostname, pcu_id):
         # Get node
         nodes = Nodes(self.api, [node_id_or_hostname])
@@ -54,9 +54,14 @@ class DeleteNodeFromPCU(Method):
                 raise PLCPermissionDenied, "Not allowed to update that PCU"
        
        # Removed node from PCU
+       
         if node['node_id'] in pcu['node_ids']:
             pcu.remove_node(node)
 
-       self.object_ids = [pcu['pcu_id']]
-        
+       # 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