Fixing LinuxNode error when checking for localhost

[nepi.git] / src / nepi / resources / linux / ns3 / ns3simulation.py

diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py
index cfef32c..dae024f 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -92,14 +92,12 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
         ns3_version = Attribute("ns3Version",
             "Version of ns-3 to install from nsam repo",
-            #default = "ns-3.19", 
             default = "ns-3.20", 
             #default = "ns-3-dev", 
             flags = Flags.Design)
 
         pybindgen_version = Attribute("pybindgenVersion",
             "Version of pybindgen to install from bazar repo",
-            #default = "864", 
             default = "868", 
             #default = "876", 
             flags = Flags.Design)
@@ -310,24 +308,6 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
             self._client.start()
 
-            """
-            # XXX: IS THIS REALLY NEEDED??!!!
-            # Wait until the Simulation is actually started... 
-            is_running = False
-            for i in xrange(1000):
-                is_running = self.invoke(SIMULATOR_UUID, "isRunning")
-                is_finished = self.invoke(SIMULATOR_UUID, "isFinished")
-            
-                if is_running or is_finished:
-                    break
-                else:
-                    time.sleep(1)
-            else:
-                if not is_running:
-                    msg = " Simulation did not start"
-                    self.error(msg)
-                    raise RuntimeError
-            """
             self.set_started()
         else:
             msg = " Failed to execute command '%s'" % command