From 4bbd854740abee8bedaa2a1156961690613e24dd Mon Sep 17 00:00:00 2001 From: Oleg Bondarev Date: Mon, 24 Aug 2015 11:29:25 +0300 Subject: [PATCH] Move db agent schedulers test to a more appropriate place Current placing is confusing as in fact the tests have little to do with ml2 and openvswitch. This was triggered by discussion on https://review.openstack.org/199514 Next step should be to separate dhcp and l3 schedulers tests. Change-Id: Ie05874fdc1c3070ed319e8f624c8217c5c0bb646 --- .../test_agentschedulers_db.py} | 0 neutron/tests/unit/plugins/ml2/test_agent_scheduler.py | 9 ++++----- tox.ini | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename neutron/tests/unit/{plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py => db/test_agentschedulers_db.py} (100%) diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py b/neutron/tests/unit/db/test_agentschedulers_db.py similarity index 100% rename from neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py rename to neutron/tests/unit/db/test_agentschedulers_db.py diff --git a/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py b/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py index 443a82845..174d3c964 100644 --- a/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py +++ b/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py @@ -13,25 +13,24 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \ - import test_agent_scheduler +from neutron.tests.unit.db import test_agentschedulers_db from neutron.tests.unit.plugins.ml2 import test_plugin class Ml2AgentSchedulerTestCase( - test_agent_scheduler.OvsAgentSchedulerTestCase): + test_agentschedulers_db.OvsAgentSchedulerTestCase): plugin_str = test_plugin.PLUGIN_NAME l3_plugin = ('neutron.services.l3_router.' 'l3_router_plugin.L3RouterPlugin') class Ml2L3AgentNotifierTestCase( - test_agent_scheduler.OvsL3AgentNotifierTestCase): + test_agentschedulers_db.OvsL3AgentNotifierTestCase): plugin_str = test_plugin.PLUGIN_NAME l3_plugin = ('neutron.services.l3_router.' 'l3_router_plugin.L3RouterPlugin') class Ml2DhcpAgentNotifierTestCase( - test_agent_scheduler.OvsDhcpAgentNotifierTestCase): + test_agentschedulers_db.OvsDhcpAgentNotifierTestCase): plugin_str = test_plugin.PLUGIN_NAME diff --git a/tox.ini b/tox.ini index df5fdb85f..b38a62d06 100644 --- a/tox.ini +++ b/tox.ini @@ -114,7 +114,6 @@ commands = python -m testtools.run \ neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \ neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_int \ neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \ - neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_agent_scheduler \ neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.test_ovs_tunnel \ neutron.tests.unit.plugins.brocade.test_brocade_db \ neutron.tests.unit.plugins.brocade.test_brocade_plugin \ @@ -157,6 +156,7 @@ commands = python -m testtools.run \ neutron.tests.unit.quota.test_resource_registry \ neutron.tests.unit.scheduler.test_l3_agent_scheduler \ neutron.tests.unit.scheduler.test_dhcp_agent_scheduler \ + neutron.tests.unit.db.test_agentschedulers_db \ neutron.tests.unit.db.test_allowedaddresspairs_db \ neutron.tests.unit.db.test_ipam_backend_mixin \ neutron.tests.unit.db.test_l3_dvr_db \ -- 2.45.2