still making both branches closer

[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 2abdb6f..3ace437 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -312,7 +311,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         """ Stops simulation execution
@@ -336,6 +335,27 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         
         super(LinuxApplication, self).do_release()
 
+    @property
+    def state(self):
+        super(LinuxApplication, self).state
+        
+        if self._state == ResourceState.STARTED:
+            try:
+                is_finished = self.invoke(SIMULATOR_UUID, "isFinished")
+                
+                if is_finished:
+                    self.set_stopped()
+            except:
+                msg = "Simulator failed. Can not retrieve state"
+                out = ""
+
+                import traceback
+                err = traceback.format_exc()
+                self.error(msg, out, err)
+                self.do_fail()
+
+        return self._state
+
     @property
     def enable_dce(self):
         if self._enable_dce is None:
@@ -703,7 +723,7 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
         """
         command = " [ -e %s ] && echo 'DONE' " % self.remote_socket
 
-        for i in xrange(200):
+        for i in range(200):
             (out, err), proc = self.node.execute(command, retry = 1, 
                     with_lock = True)