git://git.onelab.eu
/
nepi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c34c9f4
)
Ticket #23: rename TestbedInstance -> TestbedController
author
Claudio-Daniel Freire
<claudio-daniel.freire@inria.fr>
Tue, 19 Apr 2011 15:21:15 +0000
(17:21 +0200)
committer
Claudio-Daniel Freire
<claudio-daniel.freire@inria.fr>
Tue, 19 Apr 2011 15:21:15 +0000
(17:21 +0200)
15 files changed:
src/nepi/core/execute.py
patch
|
blob
|
history
src/nepi/core/testbed_impl.py
patch
|
blob
|
history
src/nepi/testbeds/netns/__init__.py
patch
|
blob
|
history
src/nepi/testbeds/netns/execute.py
patch
|
blob
|
history
src/nepi/testbeds/ns3/__init__.py
patch
|
blob
|
history
src/nepi/testbeds/ns3/execute.py
patch
|
blob
|
history
src/nepi/testbeds/planetlab/__init__.py
patch
|
blob
|
history
src/nepi/testbeds/planetlab/execute.py
patch
|
blob
|
history
src/nepi/util/proxy.py
patch
|
blob
|
history
test/core/execute.py
patch
|
blob
|
history
test/lib/mock/__init__.py
patch
|
blob
|
history
test/lib/mock/execute.py
patch
|
blob
|
history
test/testbeds/netns/execute.py
patch
|
blob
|
history
test/testbeds/ns3/execute.py
patch
|
blob
|
history
test/testbeds/ns3/execute2.py
patch
|
blob
|
history
diff --git
a/src/nepi/core/execute.py
b/src/nepi/core/execute.py
index
e353b69
..
8aaf1e0
100644
(file)
--- a/
src/nepi/core/execute.py
+++ b/
src/nepi/core/execute.py
@@
-166,7
+166,7
@@
class Factory(AttributesMap):
self._box_attributes.add_attribute(name, help, type, value, range,
allowed, flags, validation_function)
self._box_attributes.add_attribute(name, help, type, value, range,
allowed, flags, validation_function)
-class Testbed
Instance
(object):
+class Testbed
Controller
(object):
def __init__(self, testbed_id, testbed_version):
self._testbed_id = testbed_id
self._testbed_version = testbed_version
def __init__(self, testbed_id, testbed_version):
self._testbed_id = testbed_id
self._testbed_version = testbed_version
diff --git
a/src/nepi/core/testbed_impl.py
b/src/nepi/core/testbed_impl.py
index
f99466f
..
fc8cf06
100644
(file)
--- a/
src/nepi/core/testbed_impl.py
+++ b/
src/nepi/core/testbed_impl.py
@@
-6,9
+6,9
@@
from nepi.core.metadata import Metadata
from nepi.util import validation
from nepi.util.constants import AF_INET, AF_INET6, STATUS_UNDETERMINED, TIME_NOW
from nepi.util import validation
from nepi.util.constants import AF_INET, AF_INET6, STATUS_UNDETERMINED, TIME_NOW
-class Testbed
Instance(execute.TestbedInstance
):
+class Testbed
Controller(execute.TestbedController
):
def __init__(self, testbed_id, testbed_version):
def __init__(self, testbed_id, testbed_version):
- super(Testbed
Instance
, self).__init__(testbed_id, testbed_version)
+ super(Testbed
Controller
, self).__init__(testbed_id, testbed_version)
self._started = False
# testbed attributes for validation
self._attributes = None
self._started = False
# testbed attributes for validation
self._attributes = None
@@
-374,7
+374,7
@@
class TestbedInstance(execute.TestbedInstance):
def trace_filename(self, guid, trace_id):
"""
def trace_filename(self, guid, trace_id):
"""
- Return a trace's file path, for Testbed
Instance
's default
+ Return a trace's file path, for Testbed
Controller
's default
implementation of trace()
"""
raise NotImplementedError
implementation of trace()
"""
raise NotImplementedError
diff --git
a/src/nepi/testbeds/netns/__init__.py
b/src/nepi/testbeds/netns/__init__.py
index
3b3f853
..
cf04252
100644
(file)
--- a/
src/nepi/testbeds/netns/__init__.py
+++ b/
src/nepi/testbeds/netns/__init__.py
@@
-2,5
+2,5
@@
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
-from execute import Testbed
Instance
+from execute import Testbed
Controller
diff --git
a/src/nepi/testbeds/netns/execute.py
b/src/nepi/testbeds/netns/execute.py
index
d1904b0
..
935add1
100644
(file)
--- a/
src/nepi/testbeds/netns/execute.py
+++ b/
src/nepi/testbeds/netns/execute.py
@@
-5,9
+5,9
@@
from constants import TESTBED_ID
from nepi.core import testbed_impl
import os
from nepi.core import testbed_impl
import os
-class Testbed
Instance(testbed_impl.TestbedInstance
):
+class Testbed
Controller(testbed_impl.TestbedController
):
def __init__(self, testbed_version):
def __init__(self, testbed_version):
- super(Testbed
Instance
, self).__init__(TESTBED_ID, testbed_version)
+ super(Testbed
Controller
, self).__init__(TESTBED_ID, testbed_version)
self._netns = None
self._home_directory = None
self._traces = dict()
self._netns = None
self._home_directory = None
self._traces = dict()
@@
-26,7
+26,7
@@
class TestbedInstance(testbed_impl.TestbedInstance):
self._netns = self._load_netns_module()
def set(self, time, guid, name, value):
self._netns = self._load_netns_module()
def set(self, time, guid, name, value):
- super(Testbed
Instance
, self).set(time, guid, name, value)
+ super(Testbed
Controller
, self).set(time, guid, name, value)
# TODO: take on account schedule time for the task
element = self._elements.get(guid)
# TODO: take on account schedule time for the task
element = self._elements.get(guid)
diff --git
a/src/nepi/testbeds/ns3/__init__.py
b/src/nepi/testbeds/ns3/__init__.py
index
3b3f853
..
cf04252
100644
(file)
--- a/
src/nepi/testbeds/ns3/__init__.py
+++ b/
src/nepi/testbeds/ns3/__init__.py
@@
-2,5
+2,5
@@
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
-from execute import Testbed
Instance
+from execute import Testbed
Controller
diff --git
a/src/nepi/testbeds/ns3/execute.py
b/src/nepi/testbeds/ns3/execute.py
index
2e7b8a0
..
12ea28b
100644
(file)
--- a/
src/nepi/testbeds/ns3/execute.py
+++ b/
src/nepi/testbeds/ns3/execute.py
@@
-8,9
+8,9
@@
import os
import sys
import threading
import sys
import threading
-class Testbed
Instance(testbed_impl.TestbedInstance
):
+class Testbed
Controller(testbed_impl.TestbedController
):
def __init__(self, testbed_version):
def __init__(self, testbed_version):
- super(Testbed
Instance
, self).__init__(TESTBED_ID, testbed_version)
+ super(Testbed
Controller
, self).__init__(TESTBED_ID, testbed_version)
self._ns3 = None
self._home_directory = None
self._traces = dict()
self._ns3 = None
self._home_directory = None
self._traces = dict()
@@
-31,14
+31,14
@@
class TestbedInstance(testbed_impl.TestbedInstance):
self._ns3 = self._load_ns3_module()
def start(self):
self._ns3 = self._load_ns3_module()
def start(self):
- super(Testbed
Instance
, self).start()
+ super(Testbed
Controller
, self).start()
self._condition = threading.Condition()
self._simulator_thread = threading.Thread(target = self._simulator_run,
args = [self._condition])
self._simulator_thread.start()
def set(self, time, guid, name, value):
self._condition = threading.Condition()
self._simulator_thread = threading.Thread(target = self._simulator_run,
args = [self._condition])
self._simulator_thread.start()
def set(self, time, guid, name, value):
- super(Testbed
Instance
, self).set(time, guid, name, value)
+ super(Testbed
Controller
, self).set(time, guid, name, value)
# TODO: take on account schedule time for the task
element = self._elements[guid]
ns3_value = self._to_ns3_value(guid, name, value)
# TODO: take on account schedule time for the task
element = self._elements[guid]
ns3_value = self._to_ns3_value(guid, name, value)
diff --git
a/src/nepi/testbeds/planetlab/__init__.py
b/src/nepi/testbeds/planetlab/__init__.py
index
3b3f853
..
cf04252
100644
(file)
--- a/
src/nepi/testbeds/planetlab/__init__.py
+++ b/
src/nepi/testbeds/planetlab/__init__.py
@@
-2,5
+2,5
@@
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
-from execute import Testbed
Instance
+from execute import Testbed
Controller
diff --git
a/src/nepi/testbeds/planetlab/execute.py
b/src/nepi/testbeds/planetlab/execute.py
index
313e51f
..
5e6a63a
100644
(file)
--- a/
src/nepi/testbeds/planetlab/execute.py
+++ b/
src/nepi/testbeds/planetlab/execute.py
@@
-5,9
+5,9
@@
from constants import TESTBED_ID
from nepi.core import testbed_impl
import os
from nepi.core import testbed_impl
import os
-class Testbed
Instance(testbed_impl.TestbedInstance
):
+class Testbed
Controller(testbed_impl.TestbedController
):
def __init__(self, testbed_version):
def __init__(self, testbed_version):
- super(Testbed
Instance
, self).__init__(TESTBED_ID, testbed_version)
+ super(Testbed
Controller
, self).__init__(TESTBED_ID, testbed_version)
self._home_directory = None
self._traces = dict()
self._home_directory = None
self._traces = dict()
@@
-20,7
+20,7
@@
class TestbedInstance(testbed_impl.TestbedInstance):
get_attribute_value("homeDirectory")
def set(self, time, guid, name, value):
get_attribute_value("homeDirectory")
def set(self, time, guid, name, value):
- super(Testbed
Instance
, self).set(time, guid, name, value)
+ super(Testbed
Controller
, self).set(time, guid, name, value)
# TODO: take on account schedule time for the task
element = self._elements[guid]
if element:
# TODO: take on account schedule time for the task
element = self._elements[guid]
if element:
diff --git
a/src/nepi/util/proxy.py
b/src/nepi/util/proxy.py
index
17c0c3a
..
574ef6b
100644
(file)
--- a/
src/nepi/util/proxy.py
+++ b/
src/nepi/util/proxy.py
@@
-299,7
+299,7
@@
def create_testbed_instance(testbed_id, testbed_version, access_config):
elif mode == AccessConfiguration.MODE_DAEMON:
(root_dir, log_level, user, host, port, agent) = \
get_access_config_params(access_config)
elif mode == AccessConfiguration.MODE_DAEMON:
(root_dir, log_level, user, host, port, agent) = \
get_access_config_params(access_config)
- return Testbed
Instance
Proxy(root_dir, log_level, testbed_id = testbed_id,
+ return Testbed
Controller
Proxy(root_dir, log_level, testbed_id = testbed_id,
testbed_version = testbed_version, host = host, port = port,
user = user, agent = agent, launch = launch)
raise RuntimeError("Unsupported access configuration '%s'" % mode)
testbed_version = testbed_version, host = host, port = port,
user = user, agent = agent, launch = launch)
raise RuntimeError("Unsupported access configuration '%s'" % mode)
@@
-309,11
+309,11
@@
def _build_testbed_instance(testbed_id, testbed_version):
if not mod_name in sys.modules:
__import__(mod_name)
module = sys.modules[mod_name]
if not mod_name in sys.modules:
__import__(mod_name)
module = sys.modules[mod_name]
- return module.Testbed
Instance
(testbed_version)
+ return module.Testbed
Controller
(testbed_version)
-class Testbed
Instance
Server(server.Server):
+class Testbed
Controller
Server(server.Server):
def __init__(self, root_dir, log_level, testbed_id, testbed_version):
def __init__(self, root_dir, log_level, testbed_id, testbed_version):
- super(Testbed
Instance
Server, self).__init__(root_dir, log_level)
+ super(Testbed
Controller
Server, self).__init__(root_dir, log_level)
self._testbed_id = testbed_id
self._testbed_version = testbed_version
self._testbed = None
self._testbed_id = testbed_id
self._testbed_version = testbed_version
self._testbed = None
@@
-669,7
+669,7
@@
class ExperimentControllerServer(server.Server):
self._controller.shutdown()
return "%d|%s" % (OK, "")
self._controller.shutdown()
return "%d|%s" % (OK, "")
-class Testbed
Instance
Proxy(object):
+class Testbed
Controller
Proxy(object):
def __init__(self, root_dir, log_level, testbed_id = None,
testbed_version = None, launch = True, host = None,
port = None, user = None, agent = None):
def __init__(self, root_dir, log_level, testbed_id = None,
testbed_version = None, launch = True, host = None,
port = None, user = None, agent = None):
@@
-681,7
+681,7
@@
class TestbedInstanceProxy(object):
if host != None:
python_code = "from nepi.util.proxy import \
TesbedInstanceServer;\
if host != None:
python_code = "from nepi.util.proxy import \
TesbedInstanceServer;\
- s = Testbed
Instance
Server('%s', %d, '%s', '%s');\
+ s = Testbed
Controller
Server('%s', %d, '%s', '%s');\
s.run()" % (root_dir, log_level, testbed_id,
testbed_version)
proc = server.popen_ssh_subprocess(python_code, host = host,
s.run()" % (root_dir, log_level, testbed_id,
testbed_version)
proc = server.popen_ssh_subprocess(python_code, host = host,
@@
-692,7
+692,7
@@
class TestbedInstanceProxy(object):
err)
else:
# launch daemon
err)
else:
# launch daemon
- s = Testbed
Instance
Server(root_dir, log_level, testbed_id,
+ s = Testbed
Controller
Server(root_dir, log_level, testbed_id,
testbed_version)
s.run()
testbed_version)
s.run()
diff --git
a/test/core/execute.py
b/test/core/execute.py
index
0c089a3
..
7718eaf
100755
(executable)
--- a/
test/core/execute.py
+++ b/
test/core/execute.py
@@
-15,7
+15,7
@@
class ExecuteTestCase(unittest.TestCase):
def test_execute(self):
testbed_version = "01"
testbed_id = "mock"
def test_execute(self):
testbed_version = "01"
testbed_id = "mock"
- instance = mock.Testbed
Instance
(testbed_version)
+ instance = mock.Testbed
Controller
(testbed_version)
instance.defer_configure("fake", True)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
instance.defer_configure("fake", True)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
diff --git
a/test/lib/mock/__init__.py
b/test/lib/mock/__init__.py
index
3b3f853
..
cf04252
100644
(file)
--- a/
test/lib/mock/__init__.py
+++ b/
test/lib/mock/__init__.py
@@
-2,5
+2,5
@@
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
# -*- coding: utf-8 -*-
from constants import TESTBED_ID
-from execute import Testbed
Instance
+from execute import Testbed
Controller
diff --git
a/test/lib/mock/execute.py
b/test/lib/mock/execute.py
index
3abdeb9
..
c714cf2
100644
(file)
--- a/
test/lib/mock/execute.py
+++ b/
test/lib/mock/execute.py
@@
-4,9
+4,9
@@
from constants import TESTBED_ID
from nepi.core import testbed_impl
from constants import TESTBED_ID
from nepi.core import testbed_impl
-class Testbed
Instance(testbed_impl.TestbedInstance
):
+class Testbed
Controller(testbed_impl.TestbedController
):
def __init__(self, testbed_version):
def __init__(self, testbed_version):
- super(Testbed
Instance
, self).__init__(TESTBED_ID, testbed_version)
+ super(Testbed
Controller
, self).__init__(TESTBED_ID, testbed_version)
def do_setup(self):
pass
def do_setup(self):
pass
@@
-15,7
+15,7
@@
class TestbedInstance(testbed_impl.TestbedInstance):
pass
def set(self, time, guid, name, value):
pass
def set(self, time, guid, name, value):
- super(Testbed
Instance
, self).set(time, guid, name, value)
+ super(Testbed
Controller
, self).set(time, guid, name, value)
def get(self, time, guid, name):
try:
def get(self, time, guid, name):
try:
diff --git
a/test/testbeds/netns/execute.py
b/test/testbeds/netns/execute.py
index
02f5138
..
f1d51b4
100755
(executable)
--- a/
test/testbeds/netns/execute.py
+++ b/
test/testbeds/netns/execute.py
@@
-19,7
+19,7
@@
class NetnsExecuteTestCase(unittest.TestCase):
def test_run_ping_if(self):
user = getpass.getuser()
testbed_version = "01"
def test_run_ping_if(self):
user = getpass.getuser()
testbed_version = "01"
- instance = netns.Testbed
Instance
(testbed_version)
+ instance = netns.Testbed
Controller
(testbed_version)
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
@@
-62,7
+62,7
@@
class NetnsExecuteTestCase(unittest.TestCase):
def test_run_ping_p2pif(self):
user = getpass.getuser()
testbed_version = "01"
def test_run_ping_p2pif(self):
user = getpass.getuser()
testbed_version = "01"
- instance = netns.Testbed
Instance
(testbed_version)
+ instance = netns.Testbed
Controller
(testbed_version)
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
@@
-102,7
+102,7
@@
class NetnsExecuteTestCase(unittest.TestCase):
def test_run_ping_routing(self):
user = getpass.getuser()
testbed_version = "01"
def test_run_ping_routing(self):
user = getpass.getuser()
testbed_version = "01"
- instance = netns.Testbed
Instance
(testbed_version)
+ instance = netns.Testbed
Controller
(testbed_version)
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "Node")
instance.defer_create(3, "Node")
diff --git
a/test/testbeds/ns3/execute.py
b/test/testbeds/ns3/execute.py
index
40ed1dd
..
fdf315c
100755
(executable)
--- a/
test/testbeds/ns3/execute.py
+++ b/
test/testbeds/ns3/execute.py
@@
-18,7
+18,7
@@
class Ns3ExecuteTestCase(unittest.TestCase):
"Test requires working ns-3 bindings")
def test_run_ping_if(self):
testbed_version = "3_9_RC3"
"Test requires working ns-3 bindings")
def test_run_ping_if(self):
testbed_version = "3_9_RC3"
- instance = ns3.Testbed
Instance
(testbed_version)
+ instance = ns3.Testbed
Controller
(testbed_version)
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "ns3::Node")
instance.defer_create(3, "ns3::Ipv4L3Protocol")
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "ns3::Node")
instance.defer_create(3, "ns3::Ipv4L3Protocol")
diff --git
a/test/testbeds/ns3/execute2.py
b/test/testbeds/ns3/execute2.py
index
f59e61c
..
0677348
100755
(executable)
--- a/
test/testbeds/ns3/execute2.py
+++ b/
test/testbeds/ns3/execute2.py
@@
-24,7
+24,7
@@
class Ns3ExecuteTestCase(unittest.TestCase):
"Test requires working ns-3 bindings")
def test_run_ping_routing(self):
testbed_version = "3_9_RC3"
"Test requires working ns-3 bindings")
def test_run_ping_routing(self):
testbed_version = "3_9_RC3"
- instance = ns3.Testbed
Instance
(testbed_version)
+ instance = ns3.Testbed
Controller
(testbed_version)
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "ns3::Node")
instance.defer_create(3, "ns3::Ipv4L3Protocol")
instance.defer_configure("homeDirectory", self.root_dir)
instance.defer_create(2, "ns3::Node")
instance.defer_create(3, "ns3::Ipv4L3Protocol")