From af6e0d8cceaabe492b9901405ce0610d72fd35cf Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Tue, 19 Apr 2011 17:21:15 +0200 Subject: [PATCH] Ticket #23: rename TestbedInstance -> TestbedController --- src/nepi/core/execute.py | 2 +- src/nepi/core/testbed_impl.py | 6 +++--- src/nepi/testbeds/netns/__init__.py | 2 +- src/nepi/testbeds/netns/execute.py | 6 +++--- src/nepi/testbeds/ns3/__init__.py | 2 +- src/nepi/testbeds/ns3/execute.py | 8 ++++---- src/nepi/testbeds/planetlab/__init__.py | 2 +- src/nepi/testbeds/planetlab/execute.py | 6 +++--- src/nepi/util/proxy.py | 14 +++++++------- test/core/execute.py | 2 +- test/lib/mock/__init__.py | 2 +- test/lib/mock/execute.py | 6 +++--- test/testbeds/netns/execute.py | 6 +++--- test/testbeds/ns3/execute.py | 2 +- test/testbeds/ns3/execute2.py | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/nepi/core/execute.py b/src/nepi/core/execute.py index e353b698..8aaf1e02 100644 --- 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) -class TestbedInstance(object): +class TestbedController(object): 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 f99466f2..fc8cf060 100644 --- 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 -class TestbedInstance(execute.TestbedInstance): +class TestbedController(execute.TestbedController): def __init__(self, testbed_id, testbed_version): - super(TestbedInstance, self).__init__(testbed_id, testbed_version) + super(TestbedController, self).__init__(testbed_id, testbed_version) 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): """ - Return a trace's file path, for TestbedInstance's default + Return a trace's file path, for TestbedController's default implementation of trace() """ raise NotImplementedError diff --git a/src/nepi/testbeds/netns/__init__.py b/src/nepi/testbeds/netns/__init__.py index 3b3f8534..cf042520 100644 --- 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 -from execute import TestbedInstance +from execute import TestbedController diff --git a/src/nepi/testbeds/netns/execute.py b/src/nepi/testbeds/netns/execute.py index d1904b00..935add11 100644 --- 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 -class TestbedInstance(testbed_impl.TestbedInstance): +class TestbedController(testbed_impl.TestbedController): def __init__(self, testbed_version): - super(TestbedInstance, self).__init__(TESTBED_ID, testbed_version) + super(TestbedController, self).__init__(TESTBED_ID, testbed_version) 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): - super(TestbedInstance, self).set(time, guid, name, value) + super(TestbedController, self).set(time, guid, name, value) # 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 3b3f8534..cf042520 100644 --- 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 -from execute import TestbedInstance +from execute import TestbedController diff --git a/src/nepi/testbeds/ns3/execute.py b/src/nepi/testbeds/ns3/execute.py index 2e7b8a04..12ea28bc 100644 --- a/src/nepi/testbeds/ns3/execute.py +++ b/src/nepi/testbeds/ns3/execute.py @@ -8,9 +8,9 @@ import os import sys import threading -class TestbedInstance(testbed_impl.TestbedInstance): +class TestbedController(testbed_impl.TestbedController): def __init__(self, testbed_version): - super(TestbedInstance, self).__init__(TESTBED_ID, testbed_version) + super(TestbedController, self).__init__(TESTBED_ID, testbed_version) 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): - super(TestbedInstance, self).start() + super(TestbedController, 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): - super(TestbedInstance, self).set(time, guid, name, value) + super(TestbedController, 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) diff --git a/src/nepi/testbeds/planetlab/__init__.py b/src/nepi/testbeds/planetlab/__init__.py index 3b3f8534..cf042520 100644 --- 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 -from execute import TestbedInstance +from execute import TestbedController diff --git a/src/nepi/testbeds/planetlab/execute.py b/src/nepi/testbeds/planetlab/execute.py index 313e51f9..5e6a63a6 100644 --- 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 -class TestbedInstance(testbed_impl.TestbedInstance): +class TestbedController(testbed_impl.TestbedController): def __init__(self, testbed_version): - super(TestbedInstance, self).__init__(TESTBED_ID, testbed_version) + super(TestbedController, self).__init__(TESTBED_ID, testbed_version) 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): - super(TestbedInstance, self).set(time, guid, name, value) + super(TestbedController, self).set(time, guid, name, value) # 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 17c0c3af..574ef6bf 100644 --- 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) - return TestbedInstanceProxy(root_dir, log_level, testbed_id = testbed_id, + return TestbedControllerProxy(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) @@ -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] - return module.TestbedInstance(testbed_version) + return module.TestbedController(testbed_version) -class TestbedInstanceServer(server.Server): +class TestbedControllerServer(server.Server): def __init__(self, root_dir, log_level, testbed_id, testbed_version): - super(TestbedInstanceServer, self).__init__(root_dir, log_level) + super(TestbedControllerServer, self).__init__(root_dir, log_level) 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, "") -class TestbedInstanceProxy(object): +class TestbedControllerProxy(object): 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;\ - s = TestbedInstanceServer('%s', %d, '%s', '%s');\ + s = TestbedControllerServer('%s', %d, '%s', '%s');\ 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 - s = TestbedInstanceServer(root_dir, log_level, testbed_id, + s = TestbedControllerServer(root_dir, log_level, testbed_id, testbed_version) s.run() diff --git a/test/core/execute.py b/test/core/execute.py index 0c089a38..7718eaf2 100755 --- 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" - instance = mock.TestbedInstance(testbed_version) + instance = mock.TestbedController(testbed_version) 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 3b3f8534..cf042520 100644 --- a/test/lib/mock/__init__.py +++ b/test/lib/mock/__init__.py @@ -2,5 +2,5 @@ # -*- coding: utf-8 -*- from constants import TESTBED_ID -from execute import TestbedInstance +from execute import TestbedController diff --git a/test/lib/mock/execute.py b/test/lib/mock/execute.py index 3abdeb9e..c714cf2d 100644 --- 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 -class TestbedInstance(testbed_impl.TestbedInstance): +class TestbedController(testbed_impl.TestbedController): def __init__(self, testbed_version): - super(TestbedInstance, self).__init__(TESTBED_ID, testbed_version) + super(TestbedController, self).__init__(TESTBED_ID, testbed_version) def do_setup(self): pass @@ -15,7 +15,7 @@ class TestbedInstance(testbed_impl.TestbedInstance): pass def set(self, time, guid, name, value): - super(TestbedInstance, self).set(time, guid, name, value) + super(TestbedController, self).set(time, guid, name, value) def get(self, time, guid, name): try: diff --git a/test/testbeds/netns/execute.py b/test/testbeds/netns/execute.py index 02f5138c..f1d51b45 100755 --- 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" - instance = netns.TestbedInstance(testbed_version) + instance = netns.TestbedController(testbed_version) 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" - instance = netns.TestbedInstance(testbed_version) + instance = netns.TestbedController(testbed_version) 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" - instance = netns.TestbedInstance(testbed_version) + instance = netns.TestbedController(testbed_version) 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 40ed1ddc..fdf315c0 100755 --- 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" - instance = ns3.TestbedInstance(testbed_version) + instance = ns3.TestbedController(testbed_version) 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 f59e61cd..06773488 100755 --- 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" - instance = ns3.TestbedInstance(testbed_version) + instance = ns3.TestbedController(testbed_version) instance.defer_configure("homeDirectory", self.root_dir) instance.defer_create(2, "ns3::Node") instance.defer_create(3, "ns3::Ipv4L3Protocol") -- 2.43.0