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

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

diff --git a/PLC/Methods/AddNodeToNodeGroup.py b/PLC/Methods/AddNodeToNodeGroup.py
index 09bc604..a552b11 100644 (file)
--- a/PLC/Methods/AddNodeToNodeGroup.py
+++ b/PLC/Methods/AddNodeToNodeGroup.py
@@ -25,8 +25,6 @@ class AddNodeToNodeGroup(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    event_type = 'AddTo'
-    object_type = 'NodeGroup'
 
     def call(self, auth, node_id_or_hostname, nodegroup_id_or_name):
         # Get node info
@@ -35,6 +33,9 @@ class AddNodeToNodeGroup(Method):
                raise PLCInvalidArgument, "No such node"
        node = nodes[0]
 
+        if node['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local node"
+
        # Get nodegroup info
         nodegroups = NodeGroups(self.api, [nodegroup_id_or_name])
         if not nodegroups:
@@ -45,6 +46,10 @@ class AddNodeToNodeGroup(Method):
        # add node to nodegroup
         if node['node_id'] not in nodegroup['node_ids']:
             nodegroup.add_node(node)
-       self.object_ids = [nodegroup['nodegroup_id']]
-
+       
+       # Logging variables
+       self.event_objects = {'NodeGroup': [nodegroup['nodegroup_id']],
+                             'Node': [node['node_id']]}
+       self.message = 'Node %d added to node group %d' % \
+               (node['node_id'], nodegroup['nodegroup_id'])
         return 1