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
mock cross_connect test added to test/core/integration.py
[nepi.git]
/
src
/
nepi
/
testbeds
/
ns3
/
execute.py
diff --git
a/src/nepi/testbeds/ns3/execute.py
b/src/nepi/testbeds/ns3/execute.py
index
0424793
..
84b8f0f
100644
(file)
--- a/
src/nepi/testbeds/ns3/execute.py
+++ b/
src/nepi/testbeds/ns3/execute.py
@@
-4,7
+4,7
@@
from constants import TESTBED_ID
from nepi.core import testbed_impl
from nepi.core.attributes import Attribute
from constants import TESTBED_ID
from nepi.core import testbed_impl
from nepi.core.attributes import Attribute
-from nepi.util.constants import T
ESTBED_STATUS_CREATED
+from nepi.util.constants import T
IME_NOW
import os
import sys
import threading
import os
import sys
import threading
@@
-39,8
+39,8
@@
class TestbedController(testbed_impl.TestbedController):
args = [self._condition])
self._simulator_thread.start()
args = [self._condition])
self._simulator_thread.start()
- def set(self,
time, guid, name, value
):
- super(TestbedController, self).set(
time, guid, name, valu
e)
+ def set(self,
guid, name, value, time = TIME_NOW
):
+ super(TestbedController, self).set(
guid, name, value, tim
e)
# TODO: take on account schedule time for the task
factory_id = self._create[guid]
factory = self._factories[factory_id]
# TODO: take on account schedule time for the task
factory_id = self._create[guid]
factory = self._factories[factory_id]
@@
-50,8
+50,8
@@
class TestbedController(testbed_impl.TestbedController):
ns3_value = self._to_ns3_value(guid, name, value)
element.SetAttribute(name, ns3_value)
ns3_value = self._to_ns3_value(guid, name, value)
element.SetAttribute(name, ns3_value)
- def get(self,
time, guid, name
):
- value = super(TestbedController, self).get(
time, guid, na
me)
+ def get(self,
guid, name, time = TIME_NOW
):
+ value = super(TestbedController, self).get(
guid, name, ti
me)
# TODO: take on account schedule time for the task
factory_id = self._create[guid]
factory = self._factories[factory_id]
# TODO: take on account schedule time for the task
factory_id = self._create[guid]
factory = self._factories[factory_id]