diff options
Diffstat (limited to 'rumba/prototypes/irati.py')
| -rw-r--r-- | rumba/prototypes/irati.py | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 0d40580..fe9b052 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -28,12 +28,13 @@ import os import rumba.ssh_support as ssh import rumba.model as mod import rumba.prototypes.irati_templates as irati_templates +import rumba.log as log -# An experiment over the IRATI implementation -from rumba import ssh_support +logger = log.get_logger(__name__) +# An experiment over the IRATI implementation class Experiment(mod.Experiment): @staticmethod @@ -90,13 +91,13 @@ class Experiment(mod.Experiment): self.enroll_nodes() def run_prototype(self): - print("irati: setting up") + logger.info("irati: setting up") self.setup() - print("irati: software initialized on all nodes") + logger.info("irati: software initialized on all nodes") self.conf_files = self.write_conf() - print("irati: configuration files generated for all nodes") + logger.info("irati: configuration files generated for all nodes") self.bootstrap_network() - print("irati: IPCPs created and enrolled on all nodes") + logger.info("irati: IPCPs created and enrolled on all nodes") def process_node(self, node): """ @@ -111,8 +112,8 @@ class Experiment(mod.Experiment): if isinstance(ipcp, mod.ShimEthIPCP): if_name = ipcp.ifname vlan = self.shim2vlan[ipcp.dif.name] - ssh_support.setup_vlan(self.testbed, node, - vlan, if_name) + ssh.setup_vlan(self.testbed, node, + vlan, if_name) gen_files_conf = self.conf_files[node] + ['da.map'] dir_path = os.path.dirname(os.path.abspath(__file__)) @@ -154,23 +155,20 @@ class Experiment(mod.Experiment): '-c /etc/%(name)s.ipcm.conf -l %(verb)s &> log &' % format_args)] - print('DEBUG: sending node setup via ssh.') - # print('Credentials:') - # print(node.ssh_config.hostname, node.ssh_config.port, - # self.testbed.username, self.testbed.password) + logger.info('Sending node setup via ssh.') ssh.execute_commands(self.testbed, node.ssh_config, cmds) def enroll_nodes(self): """Runs the enrollments one by one, respecting dependencies""" for enrollment_list in self.enrollments: for e in enrollment_list: - print( + logger.debug( 'I am going to enroll %s to DIF %s against neighbor %s,' - ' through lower DIF %s' - % (e['enrollee'].name, - e['dif'].name, - e['enroller'].name, - e['lower_dif'].name)) + ' through lower DIF %s', + e['enrollee'].name, + e['dif'].name, + e['enroller'].name, + e['lower_dif'].name) subprocess.check_call('sleep 2'. split()) # Important! @@ -184,11 +182,7 @@ class Experiment(mod.Experiment): '--enrollee-name %(dif)s.%(name)s.IPCP ' '--enroller-name %(dif)s.%(o_name)s.IPCP' % e_args) - print('DEBUG: sending enrollment operation via ssh.') - # print('Credentials:') - # print(e['enrollee'].ssh_config.hostname, - # e['enrollee'].ssh_config.port, - # self.testbed.username, self.testbed.password) + logger.info('Sending enrollment operation via ssh.') ssh.execute_command(self.testbed, e['enrollee'].ssh_config, cmd) @@ -293,7 +287,6 @@ class Experiment(mod.Experiment): "difName": shim_name }) - template_file_name = self.conf_dir( 'shimeth.%s.%s.dif' % (node.name, shim_name)) |