From: Julien Tribino <julien.tribino@inria.fr>
Date: Wed, 13 Nov 2013 15:23:16 +0000 (+0100)
Subject: remove all the self.fail() to avoid deadlock
X-Git-Tag: nepi-3.0.0~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3bd55e6ff6fdae800a12055ad6846627b1281300;p=nepi.git

remove all the self.fail() to avoid deadlock
---

diff --git a/src/nepi/resources/planetlab/node.py b/src/nepi/resources/planetlab/node.py
index c25f2d7a..a09bb70e 100644
--- a/src/nepi/resources/planetlab/node.py
+++ b/src/nepi/resources/planetlab/node.py
@@ -642,28 +642,23 @@ class PlanetlabNode(LinuxNode):
         return ip
 
     def fail_discovery(self):
-        self.fail()
         msg = "Discovery failed. No candidates found for node"
         self.error(msg)
         raise RuntimeError, msg
 
     def fail_node_not_alive(self, hostname=None):
-        self.fail()
         msg = "Node %s not alive" % hostname
         raise RuntimeError, msg
     
     def fail_node_not_available(self, hostname):
-        self.fail()
         msg = "Node %s not available for provisioning" % hostname
         raise RuntimeError, msg
 
     def fail_not_enough_nodes(self):
-        self.fail()
         msg = "Not enough nodes available for provisioning"
         raise RuntimeError, msg
 
     def fail_plapi(self):
-        self.fail()
         msg = "Failing while trying to instanciate the PLC API"
         raise RuntimeError, msg