git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding DCE version and checking the ns3server socket is created before finishing...
[nepi.git]
/
src
/
nepi
/
resources
/
ns3
/
ns3wrapper.py
diff --git
a/src/nepi/resources/ns3/ns3wrapper.py
b/src/nepi/resources/ns3/ns3wrapper.py
index
58da68e
..
3306b30
100644
(file)
--- a/
src/nepi/resources/ns3/ns3wrapper.py
+++ b/
src/nepi/resources/ns3/ns3wrapper.py
@@
-176,6
+176,10
@@
class NS3Wrapper(object):
def is_running(self):
return self._started and not self.ns3.Simulator.IsFinished()
def is_running(self):
return self._started and not self.ns3.Simulator.IsFinished()
+ @property
+ def is_finished(self):
+ return self.ns3.Simulator.IsFinished()
+
def make_uuid(self):
return "uuid%s" % uuid.uuid4()
def make_uuid(self):
return "uuid%s" % uuid.uuid4()
@@
-260,6
+264,8
@@
class NS3Wrapper(object):
if operation == "isRunning":
result = self.is_running
if operation == "isRunning":
result = self.is_running
+ elif operation == "isFinished":
+ result = self.is_finished
elif operation == "isAppRunning":
result = self._is_app_running(uuid)
elif operation == "addStaticRoute":
elif operation == "isAppRunning":
result = self._is_app_running(uuid)
elif operation == "addStaticRoute":