Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py
index 0c63411..c0d5eff 100644 (file)
--- 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):
@@ -32,15 +33,15 @@ class AddNodeToPCU(Method):
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node"
-
         node = nodes[0]
-       PLCCheckLocalNode(node,"AddNodeToPCU")
+
+        if node['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local node"
 
         # Get PCU
         pcus = PCUs(self.api, [pcu_id])
         if not pcus:
             raise PLCInvalidArgument, "No such PCU"
-
         pcu = pcus[0]
 
         if 'admin' not in self.caller['roles']:
@@ -66,7 +67,8 @@ class AddNodeToPCU(Method):
         pcu.add_node(node, port)
 
        # Logging variables
-       self.object_ids = [node['node_id'], pcu['pcu_id']]
+       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