X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddNodeToPCU.py;h=72ed8a50438ec4c9c6ced7af3edc01bb58011ac1;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=279731dd034a514f65e88717d30dbe31b30c9ebf;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git diff --git a/PLC/Methods/AddNodeToPCU.py b/PLC/Methods/AddNodeToPCU.py index 279731d..72ed8a5 100644 --- a/PLC/Methods/AddNodeToPCU.py +++ b/PLC/Methods/AddNodeToPCU.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed @@ -22,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') @@ -31,7 +29,7 @@ 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" @@ -55,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" @@ -68,9 +66,9 @@ class AddNodeToPCU(Method): pcu.add_node(node, 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) + # 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