diff options
Diffstat (limited to 'rumba/testbeds/emulab.py')
| -rw-r--r-- | rumba/testbeds/emulab.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index 605e326..690612f 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -63,14 +63,14 @@ class Testbed(mod.Testbed): self.url = url self.image = image self.ip = dict() - self.ops_ssh_config = mod.SSHConfig(self.ops_server()) + self.ops_ssh_config = mod.SSHConfig(self._ops_server()) self.executor = SSHExecutor if "wall" in url: self.http_proxy="https://proxy.atlantis.ugent.be:8080" - def ops_server(self): + def _ops_server(self): """ Return server name of the ops-server (is testbed specific). @@ -78,7 +78,7 @@ class Testbed(mod.Testbed): """ return 'ops.' + self.url - def full_name(self, node_name): + def _full_name(self, node_name): """ Return server name of a node. @@ -88,7 +88,7 @@ class Testbed(mod.Testbed): return node_name + '.' + self.exp_name + '.' + \ self.proj_name + '.' + self.url - def get_experiment_list(self, project_name=None): + def _get_experiment_list(self, project_name=None): """ Get list of made emulab experiments accessible with your credentials. @@ -106,7 +106,7 @@ class Testbed(mod.Testbed): except: return {project_name: {project_name: []}} - def swap_exp_in(self): + def _swap_exp_in(self): """ Swaps experiment in. @@ -139,7 +139,7 @@ class Testbed(mod.Testbed): proj_name = self.proj_name exp_name = self.exp_name - exp_list = self.get_experiment_list() + exp_list = self._get_experiment_list() try: if exp_name in exp_list[proj_name][proj_name]: @@ -148,7 +148,7 @@ class Testbed(mod.Testbed): except: logger.info("First experiment to be created for that project.") - ns = self.generate_ns_script(experiment) + ns = self._generate_ns_script(experiment) dest_file_name = '/users/' + self.username + \ '/temp_ns_file.%s.ns' % os.getpid() ssh.write_text_to_file(self, self.ops_ssh_config, ns, dest_file_name) @@ -167,7 +167,7 @@ class Testbed(mod.Testbed): ssh.execute_command(self, self.ops_ssh_config, 'rm ' + dest_file_name) - def generate_ns_script(self, experiment): + def _generate_ns_script(self, experiment): """ Generate ns script based on network graph. Enables to customize default node image. @@ -198,7 +198,7 @@ class Testbed(mod.Testbed): return ns2_script - def wait_until_nodes_up(self): + def _wait_until_nodes_up(self): """ Checks if nodes are up. """ @@ -221,7 +221,7 @@ class Testbed(mod.Testbed): logger.info("Still waiting") time.sleep(5) - def complete_experiment_graph(self, experiment): + def _complete_experiment_graph(self, experiment): """ Gets the interface (ethx) to link mapping. @@ -229,7 +229,7 @@ class Testbed(mod.Testbed): """ for node in experiment.nodes: - node.ssh_config.hostname = self.full_name(node.name) + node.ssh_config.hostname = self._full_name(node.name) node.ssh_config.set_username(self.username) node.ssh_config.set_password(self.password) @@ -273,12 +273,12 @@ class Testbed(mod.Testbed): mod.Testbed.swap_in(self, experiment) self._create_experiment(experiment) - wait = self.swap_exp_in() + wait = self._swap_exp_in() if wait: - self.wait_until_nodes_up() - self.complete_experiment_graph(experiment) + self._wait_until_nodes_up() + self._complete_experiment_graph(experiment) - def swap_out(self, experiment): + def _swap_out(self, experiment): """ Swaps experiment out |