From cf36bd4ca52bec4a707c35df261b8a2630850e68 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 22 Jan 2020 13:34:29 +0000 Subject: [PATCH] Enable ovsdb debug messages in functional and fullstack Enable the configuration flag "ovsdb_debug" for functional and fullstack tests. If enable, NeutronOvsdbIdl won't define any log level when setting up the logger; if not "max_level" is defined, all messages are logged. Change-Id: I1185c1ca2556e2aed27051efd98a1d141f5298c9 Related-Bug: #1802640 --- neutron/common/config.py | 1 - neutron/tests/fullstack/resources/config.py | 1 + neutron/tests/functional/base.py | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/neutron/common/config.py b/neutron/common/config.py index 3bad679aeac..40d289f81ff 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -43,7 +43,6 @@ EXTRA_LOG_LEVEL_DEFAULTS = [ 'OfctlService=INFO', 'os_ken.base.app_manager=INFO', 'os_ken.controller.controller=INFO', - 'ovsdbapp.backend.ovs_idl.vlog=INFO' ] # Register the configuration options diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py index 34720f6bf3d..0b698c7099e 100644 --- a/neutron/tests/fullstack/resources/config.py +++ b/neutron/tests/fullstack/resources/config.py @@ -204,6 +204,7 @@ class OVSConfigFixture(ConfigFixture): 'integration_bridge': self._generate_integration_bridge(), 'bridge_mappings': '%s:%s' % (PHYSICAL_NETWORK_NAME, ext_dev), 'of_inactivity_probe': '0', + 'ovsdb_debug': 'True', }, 'securitygroup': { 'firewall_driver': host_desc.firewall_driver, diff --git a/neutron/tests/functional/base.py b/neutron/tests/functional/base.py index 409ba37fe29..d6e7dfeb91a 100644 --- a/neutron/tests/functional/base.py +++ b/neutron/tests/functional/base.py @@ -92,7 +92,9 @@ class BaseSudoTestCase(BaseLoggingTestCase): def _override_default_config(): # NOTE(ralonsoh): once https://review.opendev.org/#/c/641681/ is # merged, we should increase the default value of those new parameters. - ovs_agent_opts = [('ovsdb_timeout', 30, 'OVS')] + ovs_agent_opts = [('ovsdb_timeout', 30, 'OVS'), + ('ovsdb_debug', True, 'OVS'), + ] ovs_agent_decorator = config_decorator( ovs_conf.register_ovs_agent_opts, ovs_agent_opts) mock.patch.object(ovs_conf, 'register_ovs_agent_opts',