Remove duplicated l3 router scheduler test cases

Turn L3SchedulerTestCase to a mixin to reduce the number of
duplicated test cases.  There's no reason to run them in both
of L3SchedulerTestCase and L3ChanceSchedulerTestCase.

Closes-Bug: #1436164
Change-Id: Iee33f77fa2f9b9e20bb9c3fc4fb11a38de14bca5

diff --git a/neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py b/neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py
index b388e083fc9f935ce5d4391ba39f7840195d8571..aa0bf010352a52f7b6abd15aeff9ac6a6361056a 100644 (file)
--- a/neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py
+++ b/neutron/tests/unit/plugins/cisco/n1kv/test_n1kv_plugin.py
@@ -1286,6 +1286,8 @@ class TestN1kvL3Test(test_l3.L3NatExtensionTestCase):
     pass
 
 
-class TestN1kvL3SchedulersTest(test_l3_agent_scheduler.L3SchedulerTestCase):
+class TestN1kvL3SchedulersTest(
+    test_l3_agent_scheduler.L3SchedulerTestCaseMixin,
+    test_plugin.NeutronDbPluginV2TestCase):
 
     pass

diff --git a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
index 267eceefa328ccb292cc7aa5e81b349b3863e053..b687c465b6ff272e79655d95d775efc43bbe6e37 100644 (file)
--- a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
+++ b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
@@ -720,21 +720,20 @@ class L3SchedulerTestBaseMixin(object):
         self.assertEqual([], agents)
 
 
-class L3SchedulerTestCase(l3_agentschedulers_db.L3AgentSchedulerDbMixin,
-                          l3_db.L3_NAT_db_mixin,
-                          common_db_mixin.CommonDbMixin,
-                          test_db_base_plugin_v2.NeutronDbPluginV2TestCase,
-                          test_l3.L3NatTestCaseMixin,
-                          L3SchedulerBaseMixin,
-                          L3SchedulerTestBaseMixin):
+class L3SchedulerTestCaseMixin(l3_agentschedulers_db.L3AgentSchedulerDbMixin,
+                               l3_db.L3_NAT_db_mixin,
+                               common_db_mixin.CommonDbMixin,
+                               test_l3.L3NatTestCaseMixin,
+                               L3SchedulerBaseMixin,
+                               L3SchedulerTestBaseMixin):
 
     def setUp(self):
         self.mock_rescheduling = False
         ext_mgr = test_l3.L3TestExtensionManager()
         plugin_str = ('neutron.tests.unit.extensions.test_l3.'
                       'TestL3NatIntAgentSchedulingPlugin')
-        super(L3SchedulerTestCase, self).setUp(plugin=plugin_str,
-                                               ext_mgr=ext_mgr)
+        super(L3SchedulerTestCaseMixin, self).setUp(plugin=plugin_str,
+                                                    ext_mgr=ext_mgr)
 
         self.adminContext = q_context.get_admin_context()
         self.plugin = manager.NeutronManager.get_plugin()
@@ -744,7 +743,9 @@ class L3SchedulerTestCase(l3_agentschedulers_db.L3AgentSchedulerDbMixin,
         self._register_l3_agents()
 
 
-class L3AgentChanceSchedulerTestCase(L3SchedulerTestCase):
+class L3AgentChanceSchedulerTestCase(L3SchedulerTestCaseMixin,
+                                     test_db_base_plugin_v2.
+                                     NeutronDbPluginV2TestCase):
 
     def test_random_scheduling(self):
         random_patch = mock.patch('random.choice')
@@ -800,7 +801,10 @@ class L3AgentChanceSchedulerTestCase(L3SchedulerTestCase):
                 self.assertEqual('host_1', agents[0]['host'])
 
 
-class L3AgentLeastRoutersSchedulerTestCase(L3SchedulerTestCase):
+class L3AgentLeastRoutersSchedulerTestCase(L3SchedulerTestCaseMixin,
+                                           test_db_base_plugin_v2.
+                                           NeutronDbPluginV2TestCase):
+
     def setUp(self):
         super(L3AgentLeastRoutersSchedulerTestCase, self).setUp()
         self.plugin.router_scheduler = importutils.import_object(