From e8aa6da10a54ad2e5d2d6f9c4cf87068fef67f4d Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com> Date: Mon, 9 Sep 2024 15:44:50 +0000 Subject: [PATCH] Make use of the utility method ``get_ml2_conf_file`` Change-Id: I0a08b343cb11dc0d75cc3ee3c9db5168e508c052 --- .../tests/scenario/test_security_group_logging.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py index 218ad22..2a6a24d 100644 --- a/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py +++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_security_group_logging.py @@ -48,18 +48,15 @@ class BaseSecGroupLoggingTest( credentials = ['primary', 'admin'] required_extensions = ['router', 'security-group', 'logging'] + ML2_CONF_FILE = utils.get_ml2_conf_file() if WB_CONF.openstack_type == 'podified': SG_LOG_FILE = '/var/log/messages' - ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini' rotate_service_fix = '-crond' elif WB_CONF.openstack_type == 'devstack': SG_LOG_FILE = '/opt/stack/logs/ovn-controller.log' - ML2_CONF_FILE = '/etc/neutron/plugins/ml2/ml2_conf.ini' rotate_service_fix = '' else: SG_LOG_FILE = '/var/log/containers/stdouts/ovn_controller.log' - ML2_CONF_FILE = ('/var/lib/config-data/puppet-generated' - '/neutron/etc/neutron/plugins/ml2/ml2_conf.ini') rotate_service_fix = '-crond' ROTATION_CHECK_CMD = ( '/usr/sbin/logrotate -s /var/lib/logrotate/'