Implement a log level option to enable ONOS logs for every test case.
This is done automatically through overriding of setUp in CordLogger which every test class should inherit.
Otherwise, one can manually enable logSet for all controllers through the CordLogger logSet api.
Change-Id: I43bd5a97e0ab9cbec7d7c51daf2d5ea0d6961505
diff --git a/src/test/cluster/clusterTest.py b/src/test/cluster/clusterTest.py
index 5099900..a694bad 100644
--- a/src/test/cluster/clusterTest.py
+++ b/src/test/cluster/clusterTest.py
@@ -108,12 +108,8 @@
self.cliExit()
return result
- def log_set(self, level = "INFO", app = "org.onosproject", controller = None):
- self.cliEnter(controller = controller)
- try:
- self.cli.logSet(level = level, app = app)
- except: pass
- self.cliExit()
+ def log_set(self, level = None, app = 'org.onosproject', controllers = None):
+ CordLogger.logSet(level = level, app = app, controllers = controllers, forced = True)
def get_leaders(self, controller = None):
result_map = {}
@@ -382,15 +378,12 @@
log.info('ITERATION: %d. Restarting Controller %s' %(num + 1, controller_name))
try:
#enable debug log for the other controllers before restarting this controller
- for ctlr in controllers:
- if ctlr == controller:
- continue
- log.info('Enabling DEBUG log for controller: %s' %ctlr)
- self.log_set(level="DEBUG", controller = ctlr)
- self.log_set(level="DEBUG", app = "io.atomix", controller = ctlr)
+ adjacent_controllers = list( set(controllers) - set([controller]) )
+ self.log_set(controllers = adjacent_controllers)
+ self.log_set(app = 'io.atomix', controllers = adjacent_controllers)
cord_test_onos_restart(node = controller_name, timeout = 0)
- self.log_set(level="DEBUG", controller = controller)
- self.log_set(level="DEBUG", app = "io.atomix", controller = controller)
+ self.log_set(controllers = controller)
+ self.log_set(app = 'io.atomix', controllers = controller)
time.sleep(60)
except:
time.sleep(5)