X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddNodeToPCU.py;h=72ed8a50438ec4c9c6ced7af3edc01bb58011ac1;hb=da06561d0f5240a5409474e16824e4e015f31fac;hp=f1c19618e65a203a947b1382f1341eaa9b76d822;hpb=d22aea71d8cd39db72394cad0b8943b387fc3b4b;p=plcapi.git diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py index f1c1961..72ed8a5 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') @@ -27,10 +28,8 @@ class AddNodeToPCU(Method): returns = Parameter(int, '1 if successful') - object_type = 'Node' - 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" @@ -54,8 +53,8 @@ class AddNodeToPCU(Method): break if not ok: raise PLCPermissionDenied, "Not allowed to update that PCU" - - # Add node to PCU + + # Add node to PCU if node['node_id'] in pcu['node_ids']: raise PLCInvalidArgument, "Node already controlled by PCU" @@ -67,8 +66,9 @@ class AddNodeToPCU(Method): 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