Fix the ImportErrors in l3 and dhcp scheduler functional tests

Change-Id: I5b8746d37173869f78a9c23834f10d630d2a36cd
Closes-bug: #1443480
(cherry picked from commit 791d57922b00857e3f8bb753bff9499f3c4e1ab9)

diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py
index 0d8b31c12c58d8615fe0b9beaa9bfb20ed3faf29..909ac591e7894175caca1e92d6965ff77803c11e 100755 (executable)
--- a/neutron/tests/functional/agent/test_l3_agent.py
+++ b/neutron/tests/functional/agent/test_l3_agent.py
@@ -48,7 +48,7 @@ from neutron.openstack.common import uuidutils
 from neutron.tests.common import net_helpers
 from neutron.tests.functional.agent.linux import base
 from neutron.tests.functional.agent.linux import helpers
-from neutron.tests.unit import test_l3_agent
+from neutron.tests.unit.agent.l3 import test_agent as test_l3_agent
 
 LOG = logging.getLogger(__name__)
 _uuid = uuidutils.generate_uuid

diff --git a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
index 9646542043e00648a7fb035690c395b43102285e..0b0c7d9fdd1977f7d6e35228d06cc18835383ed9 100644 (file)
--- a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
+++ b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
@@ -21,7 +21,8 @@ from neutron.db import agents_db
 from neutron.db import agentschedulers_db
 from neutron.db import common_db_mixin
 from neutron.scheduler import dhcp_agent_scheduler
-from neutron.tests.unit import test_dhcp_scheduler as test_dhcp_sch
+from neutron.tests.unit.scheduler import (test_dhcp_agent_scheduler as
+                                          test_dhcp_sch)
 from operator import attrgetter
 
 # Required to generate tests from scenarios. Not compatible with nose.