X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteNodeFromPCU.py;h=892d77fbaf0af5b77a46ea884f917c9a929880a5;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=9e2afec33595e9012e3c6bd3dba071ba5727afe1;hpb=1ca86d7edb5cb3aea58f636dd8fba7747476f300;p=plcapi.git

diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py
index 9e2afec..892d77f 100644
--- a/PLC/Methods/DeleteNodeFromPCU.py
+++ b/PLC/Methods/DeleteNodeFromPCU.py
@@ -3,7 +3,8 @@ 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.Sites import Site, Sites
+from PLC.Auth import Auth
 
 class DeleteNodeFromPCU(Method):
     """
@@ -17,8 +18,8 @@ class DeleteNodeFromPCU(Method):
     roles = ['admin', 'pi', 'tech']
 
     accepts = [
-        PasswordAuth(),
-	Mixed(Node.fields['node_id'],
+        Auth(),
+        Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
         PCU.fields['pcu_id']
         ]
@@ -26,32 +27,39 @@ class DeleteNodeFromPCU(Method):
     returns = Parameter(int, '1 if successful')
 
     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"
 
-        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
                     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)
 
+        # 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