X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fnetns%2Fnetnsapplication.py;h=2ed1363cbc7cc6dd00ec67d143c3b8e7d5c62021;hp=5ffff92cbe7bbb2d4e4137a386a04b9da2b05d50;hb=817fc4e07d55f1925a52a7744f1f4b3ec24a8c98;hpb=168b2491f368321ac176460e7c1878bfcf567b42 diff --git a/src/nepi/resources/netns/netnsapplication.py b/src/nepi/resources/netns/netnsapplication.py index 5ffff92c..2ed1363c 100644 --- a/src/nepi/resources/netns/netnsapplication.py +++ b/src/nepi/resources/netns/netnsapplication.py @@ -57,7 +57,7 @@ class NetNSApplication(NetNSBase): return [self.node] def do_start(self): - if self.simulation.state < ResourceState.STARTED: + if self.emulation.state < ResourceState.STARTED: self.debug("---- RESCHEDULING START ----" ) self.ec.schedule(self.reschedule_delay, self.start) else: @@ -74,8 +74,8 @@ class NetNSApplication(NetNSBase): self._start_time = self.emulation.start_time def _configure_traces(self): - stdout = "%s/%d.stdout " % (self.emulation.run_home, self.pid) - stderr = "%s/%d.stderr " % (self.emulation.run_home, self.pid) + stdout = "%s/%d.stdout" % (self.emulation.run_home, self.guid) + stderr = "%s/%d.stderr" % (self.emulation.run_home, self.guid) self._trace_filename["stdout"] = stdout self._trace_filename["stderr"] = stderr self._traces["stdout"] = self.emulation.create("open", stdout, "w") @@ -86,8 +86,8 @@ class NetNSApplication(NetNSBase): if self._state == ResourceState.STARTED: retcode = self.emulation.invoke(self.uuid, "poll") - if retcode: - if ret == 0: + if retcode is not None: + if retcode == 0: self.set_stopped() else: out = ""