Merge branch 'logging-levels' into 'master'

Logging: added set and reset logging level method, small logging modifications.

See merge request !40

1 files changed, 6 insertions, 6 deletions

diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index 346b39a..b2f54d9 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -117,6 +117,7 @@ class Experiment(mod.Experiment):
         """
         name = node.name
 
+        logger.info('Setting up vlans for node %s', node.name)
         for ipcp in node.ipcps:
             if isinstance(ipcp, mod.ShimEthIPCP):
                 if_name = ipcp.ifname
@@ -147,7 +148,7 @@ class Experiment(mod.Experiment):
                        'verb': 'DBG',
                        'ipcmcomps': ipcm_components}
 
-        # TODO: watch out for empty path...
+        logger.info('Copying configuration files to node %s', node.name)
         ssh.copy_paths_to_testbed(self.testbed,
                                   node.ssh_config,
                                   gen_files,
@@ -164,16 +165,16 @@ class Experiment(mod.Experiment):
                            '-c /etc/%(name)s.ipcm.conf -l %(verb)s &> log &'
                            % format_args)]
 
-        logger.info('Sending node setup via ssh.')
+        logger.info('Sending setup commands to node %s.', node.name)
         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:
-                logger.debug(
-                    'I am going to enroll %s to DIF %s against neighbor %s,'
-                    ' through lower DIF %s',
+                logger.info(
+                    'Enrolling %s to DIF %s against neighbor %s,'
+                    ' through lower DIF %s.',
                     e['enrollee'].name,
                     e['dif'].name,
                     e['enroller'].name,
@@ -192,7 +193,6 @@ class Experiment(mod.Experiment):
                                 '--enrollee-name %(iname)s.IPCP '
                                 '--enroller-name %(o_iname)s.IPCP'
                                 % e_args)
-                logger.info('Sending enrollment operation via ssh.')
                 ssh.execute_command(self.testbed,
                                     e['enrollee'].node.ssh_config,
                                     cmd)