From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 22 Jun 2011 15:14:48 +0000 (+0200)
Subject: Merge with head
X-Git-Tag: nepi_v2_1~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c13c5dacdb4213b865302f4ac104971ede43ed3;hp=7306c27230a7652cb6d7e4fb59dcc855740874ac;p=nepi.git

Merge with head
---

diff --git a/src/nepi/testbeds/ns3/execute.py b/src/nepi/testbeds/ns3/execute.py
index 1fdd4154..d0310901 100644
--- a/src/nepi/testbeds/ns3/execute.py
+++ b/src/nepi/testbeds/ns3/execute.py
@@ -134,7 +134,7 @@ class TestbedController(testbed_impl.TestbedController):
             
             # Wait for it to stop, with a 30s timeout
             for i in xrange(300):
-                if self.ns3.Simulator.isFinished():
+                if self.ns3.Simulator.IsFinished():
                     break
                 time.sleep(0.1)
             #self._stop_simulation("0s")