X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fplanetlab%2Ftap.py;h=991fa99b6b7e39d4348432d68f2453c4fcce0eee;hb=386498468dfb01f71b0efbbe0c208819f18f82ec;hp=c4867b2df08e9bd505bda5b6b0d5c664afa5055b;hpb=4b0e922489532434f0968647886021542b77cece;p=nepi.git diff --git a/src/nepi/resources/planetlab/tap.py b/src/nepi/resources/planetlab/tap.py index c4867b2d..991fa99b 100644 --- a/src/nepi/resources/planetlab/tap.py +++ b/src/nepi/resources/planetlab/tap.py @@ -165,8 +165,8 @@ class PlanetlabTap(LinuxApplication): self.provision() except: self.fail() - raise - + return + self.debug("----- READY ---- ") self.set_ready() @@ -180,7 +180,6 @@ class PlanetlabTap(LinuxApplication): msg = " Failed to execute command '%s'" % command self.error(msg, out, err) self.fail() - raise RuntimeError, msg def stop(self): command = self.get('command') or '' @@ -206,8 +205,7 @@ class PlanetlabTap(LinuxApplication): if out.strip().find(self.get("deviceName")) == -1: # tap is not running is not running (socket not found) - self._finish_time = tnow() - self._state = ResourceState.FINISHED + self.finish() self._last_state_check = tnow() @@ -243,7 +241,6 @@ class PlanetlabTap(LinuxApplication): else: msg = "Couldn't retrieve if_name" self.error(msg, out, err) - self.fail() raise RuntimeError, msg return if_name