From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 18 Dec 2014 04:21:53 +0000 (+0000)
Subject: Merge "L3 Agent restructure - observer hierarchy"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2494da22007b204113e48f5fe2ccbcb8594ce1f2;p=openstack-build%2Fneutron-build.git

Merge "L3 Agent restructure - observer hierarchy"
---

2494da22007b204113e48f5fe2ccbcb8594ce1f2
diff --cc neutron/agent/l3/agent.py
index 7b2fa3d87,f598124c5..279c332e2
--- a/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -50,8 -51,10 +51,9 @@@ from neutron import manage
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import loopingcall
  from neutron.openstack.common import periodic_task
 -from neutron.openstack.common import processutils
  from neutron.openstack.common import service
  from neutron import service as neutron_service
+ from neutron.services import advanced_service as adv_svc
  try:
      from neutron_fwaas.services.firewall.agents.l3reference \
          import firewall_l3_agent
diff --cc neutron/tests/functional/agent/test_l3_agent.py
index 0eaab4bbd,0c99a5923..e24ca504c
--- a/neutron/tests/functional/agent/test_l3_agent.py
+++ b/neutron/tests/functional/agent/test_l3_agent.py
@@@ -33,9 -27,9 +33,10 @@@ from neutron.common import config as co
  from neutron.common import constants as l3_constants
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import uuidutils
+ from neutron.services import advanced_service as adv_svc
  from neutron.tests.common.agents import l3_agent as l3_test_agent
  from neutron.tests.functional.agent.linux import base
 +from neutron.tests.functional.agent.linux import helpers
  from neutron.tests.unit import test_l3_agent
  
  LOG = logging.getLogger(__name__)