X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddNodeToPCU.py;h=29044569030877b0dd5d269ea955c6bb5d7d0b69;hb=d20644a48d03667bb25dc583517de06e94606c64;hp=ff40541323081a993ec5da67e67ff17cb085575d;hpb=ac29a9eebfa173766903dbc8c06c01fc18335bab;p=plcapi.git

diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py
index ff40541..2904456 100644
--- a/PLC/Methods/AddNodeToPCU.py
+++ b/PLC/Methods/AddNodeToPCU.py
@@ -3,6 +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.Sites import Site, Sites
 from PLC.Auth import Auth
 
 class AddNodeToPCU(Method):
@@ -19,7 +20,7 @@ class AddNodeToPCU(Method):
 
     accepts = [
         Auth(),
-	Mixed(Node.fields['node_id'],
+        Mixed(Node.fields['node_id'],
               Node.fields['hostname']),
         PCU.fields['pcu_id'],
         Parameter(int, 'PCU port number')
@@ -28,19 +29,19 @@ class AddNodeToPCU(Method):
     returns = Parameter(int, '1 if successful')
 
     def call(self, auth, node_id_or_hostname, pcu_id, port):
-	 # Get node
+         # Get node
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
-            raise PLCInvalidArgument, "No such node"
+            raise PLCInvalidArgument("No such node")
         node = nodes[0]
 
         if node['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local node"
+            raise PLCInvalidArgument("Not a local node")
 
         # Get PCU
         pcus = PCUs(self.api, [pcu_id])
         if not pcus:
-            raise PLCInvalidArgument, "No such PCU"
+            raise PLCInvalidArgument("No such PCU")
         pcu = pcus[0]
 
         if 'admin' not in self.caller['roles']:
@@ -51,22 +52,23 @@ class AddNodeToPCU(Method):
                     ok = True
                     break
             if not ok:
-                raise PLCPermissionDenied, "Not allowed to update that PCU"
-	
-	# Add node to PCU
+                raise PLCPermissionDenied("Not allowed to update that PCU")
+
+        # Add node to PCU
         if node['node_id'] in pcu['node_ids']:
-            raise PLCInvalidArgument, "Node already controlled by PCU"
+            raise PLCInvalidArgument("Node already controlled by PCU")
 
         if node['site_id'] != pcu['site_id']:
-            raise PLCInvalidArgument, "Node is at a different site than this PCU"
+            raise PLCInvalidArgument("Node is at a different site than this PCU")
 
         if port in pcu['ports']:
-            raise PLCInvalidArgument, "PCU port already in use"
+            raise PLCInvalidArgument("PCU port already in use")
 
         pcu.add_node(node, port)
 
-	# Logging variables
-	self.object_ids = [node['node_id'], pcu['pcu_id']]
-	self.message = 'Node %d added to pcu %d on port %d' % \
-		(node['node_id'], pcu['pcu_id'], port)
+        # Logging variables
+        self.event_objects = {'Node': [node['node_id']],
+                              'PCU': [pcu['pcu_id']]}
+        self.message = 'Node %d added to pcu %d on port %d' % \
+                (node['node_id'], pcu['pcu_id'], port)
         return 1