openstack
/
neutron
Code Issues Proposed changes

Merge "Enable logging for scheduler functional tests"

This commit is contained in:
Zuul 2024-02-20 22:14:36 +00:00 committed by Gerrit Code Review
parent f99ee353e4 e7154d748e
commit d318cd0b75
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
View File

@ -27,6 +27,7 @@ from neutron.db import agentschedulers_db
from neutron.objects import network
from neutron.scheduler import dhcp_agent_scheduler
from neutron.tests.common import helpers
from neutron.tests.functional import base
from neutron.tests.unit.plugins.ml2 import test_plugin
from neutron.tests.unit.scheduler import (test_dhcp_agent_scheduler as
test_dhcp_sch)
@ -105,7 +106,8 @@ class BaseTestScheduleNetwork(object):
class TestChanceScheduleNetwork(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
agentschedulers_db.DhcpAgentSchedulerDbMixin,
agents_db.AgentDbMixin,
BaseTestScheduleNetwork):
BaseTestScheduleNetwork,
base.BaseLoggingTestCase):
"""Test various scenarios for ChanceScheduler.schedule."""
def test_schedule_network(self):
@ -142,7 +144,8 @@ class TestChanceScheduleNetwork(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
class TestWeightScheduleNetwork(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
agentschedulers_db.DhcpAgentSchedulerDbMixin,
agents_db.AgentDbMixin,
BaseTestScheduleNetwork):
BaseTestScheduleNetwork,
base.BaseLoggingTestCase):
"""Test various scenarios for WeightScheduler.schedule."""
def test_weight_schedule_network(self):
@ -187,7 +190,8 @@ class TestWeightScheduleNetwork(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
class TestAutoSchedule(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
agentschedulers_db.DhcpAgentSchedulerDbMixin,
agents_db.AgentDbMixin):
agents_db.AgentDbMixin,
base.BaseLoggingTestCase):
"""Test various scenarios for ChanceScheduler.auto_schedule_networks.
Below is the brief description of the scenario variables
@ -415,7 +419,8 @@ class TestAutoSchedule(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
class TestAZAwareWeightScheduler(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
agentschedulers_db.DhcpAgentSchedulerDbMixin,
agents_db.AgentDbMixin):
agents_db.AgentDbMixin,
base.BaseLoggingTestCase):
"""Test various scenarios for AZAwareWeightScheduler.schedule.
az_count
@ -554,7 +559,8 @@ class TestAZAwareWeightScheduler(test_dhcp_sch.TestDhcpSchedulerBaseTestCase,
class TestDHCPSchedulerWithNetworkAccessibility(
test_plugin.Ml2PluginV2TestCase):
test_plugin.Ml2PluginV2TestCase,
base.BaseLoggingTestCase):
_mechanism_drivers = ['openvswitch']

7
neutron/tests/functional/scheduler/test_l3_agent_scheduler.py
View File

@ -29,6 +29,7 @@ from neutron.objects import network as net_obj
from neutron.scheduler import l3_agent_scheduler
from neutron.services.l3_router import l3_router_plugin
from neutron.tests.common import helpers
from neutron.tests.functional import base
from neutron.tests.unit.db import test_db_base_plugin_v2
_uuid = uuidutils.generate_uuid
@ -39,7 +40,8 @@ PLUGIN_NAME = 'neutron.plugins.ml2.plugin.Ml2Plugin'
load_tests = testscenarios.load_tests_apply_scenarios
class L3SchedulerBaseTest(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
class L3SchedulerBaseTest(test_db_base_plugin_v2.NeutronDbPluginV2TestCase,
base.BaseLoggingTestCase):
"""Base class for functional test of L3 schedulers.
Provides basic setup and utility functions.
@ -293,7 +295,8 @@ class L3LeastRoutersSchedulerTestCase(L3SchedulerBaseTest):
self._test_auto_schedule(self.expected_scheduled_router_count)
class L3AZSchedulerBaseTest(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
class L3AZSchedulerBaseTest(test_db_base_plugin_v2.NeutronDbPluginV2TestCase,
base.BaseLoggingTestCase):
def setUp(self):
super(L3AZSchedulerBaseTest, self).setUp(plugin='ml2')