X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteNodeFromPCU.py;h=892d77fbaf0af5b77a46ea884f917c9a929880a5;hb=475ee53aaaa011ba14a34af34d3340257d6f9d59;hp=6e9ef384fe1e101ab8895ef1d6d318b5dd18dff6;hpb=286cdfc25f6ef8fd3e0ed59a175bcf801b14038a;p=plcapi.git diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py index 6e9ef38..892d77f 100644 --- a/PLC/Methods/DeleteNodeFromPCU.py +++ b/PLC/Methods/DeleteNodeFromPCU.py @@ -1,4 +1,3 @@ -# $Id# from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed @@ -20,7 +19,7 @@ class DeleteNodeFromPCU(Method): accepts = [ Auth(), - Mixed(Node.fields['node_id'], + Mixed(Node.fields['node_id'], Node.fields['hostname']), PCU.fields['pcu_id'] ] @@ -28,7 +27,7 @@ class DeleteNodeFromPCU(Method): returns = Parameter(int, '1 if successful') def call(self, auth, node_id_or_hostname, pcu_id): - # Get node + # Get node nodes = Nodes(self.api, [node_id_or_hostname]) if not nodes: raise PLCInvalidArgument, "No such node" @@ -51,16 +50,16 @@ class DeleteNodeFromPCU(Method): break if not ok: raise PLCPermissionDenied, "Not allowed to update that PCU" - - # Removed node from PCU - + + # Removed node from PCU + if node['node_id'] in pcu['node_ids']: pcu.remove_node(node) - # Logging variables - self.event_objects = {'PCU': [pcu['pcu_id']], - 'Node': [node['node_id']]} - self.message = 'Node %d removed from PCU %d' % \ - (node['node_id'], pcu['pcu_id']) - - return 1 + # Logging variables + self.event_objects = {'PCU': [pcu['pcu_id']], + 'Node': [node['node_id']]} + self.message = 'Node %d removed from PCU %d' % \ + (node['node_id'], pcu['pcu_id']) + + return 1