X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeleteNodeFromPCU.py;h=2688cd6d7c4bcf6131cd5dbe442be6b3778f51b5;hb=c3fc031363ac794e6b1245c6ed1a05329cba69c9;hp=d2682986ecd26b05841dbf0065d5fb4950f2a7db;hpb=41063c2352286a103b95821293a961f219900f39;p=plcapi.git diff --git a/PLC/Methods/DeleteNodeFromPCU.py b/PLC/Methods/DeleteNodeFromPCU.py index d268298..2688cd6 100644 --- a/PLC/Methods/DeleteNodeFromPCU.py +++ b/PLC/Methods/DeleteNodeFromPCU.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 DeleteNodeFromPCU(Method): @@ -18,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'] ] @@ -26,17 +27,17 @@ 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" + raise PLCInvalidArgument("No such node") node = nodes[0] # Get PCU pcus = PCUs(self.api, [pcu_id]) if not pcus: - raise PLCInvalidArgument, "No such PCU" + raise PLCInvalidArgument("No such PCU") pcu = pcus[0] @@ -48,17 +49,17 @@ class DeleteNodeFromPCU(Method): ok = True break if not ok: - raise PLCPermissionDenied, "Not allowed to update that PCU" - - # Removed node from PCU - + raise PLCPermissionDenied("Not allowed to update that 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