applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / ns3 / ns3application.py

diff --git a/src/nepi/resources/ns3/ns3application.py b/src/nepi/resources/ns3/ns3application.py
index 64bacf7..681e1a1 100644 (file)
--- a/src/nepi/resources/ns3/ns3application.py
+++ b/src/nepi/resources/ns3/ns3application.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
@@ -37,7 +36,7 @@ class NS3BaseApplication(NS3Base):
             if not nodes: 
                 msg = "Application not connected to node"
                 self.error(msg)
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
 
             self._node = nodes[0]
 
@@ -73,10 +72,19 @@ class NS3BaseApplication(NS3Base):
     @property
     def state(self):
         if self._state == ResourceState.STARTED:
-            is_running = self.simulation.invoke(self.uuid, "isAppRunning")
-            
-            if not is_running:
-                self.set_stopped()
+            try:
+                is_running = self.simulation.invoke(self.uuid, "isAppRunning")
+                
+                if not is_running:
+                    self.set_stopped()
+            except:
+                msg = "Application failed. Can not retrieve state"
+                out = ""
+
+                import traceback
+                err = traceback.format_exc()
+                self.error(msg, out, err)
+                self.do_fail()
 
         return self._state