Fixing validation of error in the state query for ns3 application

[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 aa11a72..6e46e7f 100644 (file)
--- a/src/nepi/resources/ns3/ns3application.py
+++ b/src/nepi/resources/ns3/ns3application.py
@@ -24,17 +24,24 @@ from nepi.resources.ns3.ns3base import NS3Base
 class NS3BaseApplication(NS3Base):
     _rtype = "abstract::ns3::Application"
 
+    def __init__(self, ec, guid):
+        super(NS3BaseApplication, self).__init__(ec, guid)
+        self._node = None
+ 
     @property
     def node(self):
-        from nepi.resources.ns3.ns3node import NS3BaseNode
-        nodes = self.get_connected(NS3BaseNode.get_rtype())
+        if not self._node:
+            from nepi.resources.ns3.ns3node import NS3BaseNode
+            nodes = self.get_connected(NS3BaseNode.get_rtype())
 
-        if not nodes: 
-            msg = "Application not connected to node"
-            self.error(msg)
-            raise RuntimeError, msg
+            if not nodes: 
+                msg = "Application not connected to node"
+                self.error(msg)
+                raise RuntimeError, msg
 
-        return nodes[0]
+            self._node = nodes[0]
+
+        return self._node
 
     @property
     def _rms_to_wait(self):
@@ -55,12 +62,30 @@ class NS3BaseApplication(NS3Base):
             self.simulation.invoke(self.uuid, "Stop")
             self.set_stopped()
 
+    def do_start(self):
+        if self.simulation.state < ResourceState.STARTED:
+            self.debug("---- RESCHEDULING START ----" )
+            self.ec.schedule(self.reschedule_delay, self.start)
+        else:
+            super(NS3BaseApplication, self).do_start()
+            self._start_time = self.simulation.start_time
+
     @property
     def state(self):
         if self._state == ResourceState.STARTED:
-            is_running = self.simulation.invoke(self.uuid, "isAppRunning")
-            if not is_running:
-                self._state = ResourceState.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