This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py
index 9e2afec..cf7f93f 100644 (file)
--- a/PLC/Methods/DeleteNodeFromPCU.py
+++ b/PLC/Methods/DeleteNodeFromPCU.py
@@ -3,7 +3,7 @@ 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.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeleteNodeFromPCU(Method):
     """
@@ -17,7 +17,7 @@ class DeleteNodeFromPCU(Method):
     roles = ['admin', 'pi', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
        Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
         PCU.fields['pcu_id']
@@ -25,24 +25,27 @@ class DeleteNodeFromPCU(Method):
 
     returns = Parameter(int, '1 if successful')
 
+    object_type = 'Node'
+
+
     def call(self, auth, node_id_or_hostname, pcu_id):
         # Get node
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
 
-        node = nodes.values()[0]
+        node = nodes[0]
 
         # Get PCU
         pcus = PCUs(self.api, [pcu_id])
         if not pcus:
             raise PLCInvalidArgument, "No such PCU"
 
-        pcu = pcus.values()[0]
+        pcu = pcus[0]
 
         if 'admin' not in self.caller['roles']:
             ok = False
-            sites = Sites(self.api, self.caller['site_ids']).values()
+            sites = Sites(self.api, self.caller['site_ids'])
             for site in sites:
                 if pcu['pcu_id'] in site['pcu_ids']:
                     ok = True
@@ -51,7 +54,13 @@ 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)
 
-        return 1
+       # Logging variables
+       self.object_ids = [pcu['pcu_id']]
+       self.message = 'Node %d removed from PCU %d' % \
+               (node['node_id'], pcu['pcu_id']) 
+       
+       return 1