use common agent topics from neutron-lib

The neutron.common.topics module was rehomed into neutron-lib with
commit Ie88b84949cbd55a4e7ad06341aab77b286cdc485
This patch consumes it by using neutron-lib's version of the module in
prep for Ia4a4604c259ce862597de80c6deeb3d408bf0e95

Change-Id: Ifcac7a08dab1d23ad992663c03bf9c1d95dc9e8e
stable/rocky
Boden R 5 years ago
parent 30b551986d
commit 5583bc37a2
  1. 4
      networking_l2gw/services/l2gateway/common/tunnel_calls.py
  2. 2
      networking_l2gw/tests/unit/services/l2gateway/test_agent_scheduler.py

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from neutron.common import topics as neutron_topics
from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
from neutron.plugins.ml2 import managers
from neutron.plugins.ml2 import rpc as rpc
from neutron_lib.agent import topics
class Tunnel_Calls(object):
@ -25,7 +25,7 @@ class Tunnel_Calls(object):
self._construct_rpc_stuff()
def _construct_rpc_stuff(self):
self.notifier = rpc.AgentNotifierApi(neutron_topics.AGENT)
self.notifier = rpc.AgentNotifierApi(topics.AGENT)
self.type_manager = managers.TypeManager()
self.tunnel_rpc_obj = rpc.RpcCallbacks(self.notifier,
self.type_manager)

@ -23,11 +23,11 @@ from oslo_service import loopingcall
from oslo_utils import timeutils
from neutron.agent.common import utils
from neutron.common import topics
from neutron.db import agents_db
from neutron import manager
from neutron.plugins.ml2 import rpc
from neutron.tests import base
from neutron_lib.agent import topics
from neutron_lib import context as neutron_context
from networking_l2gw.services.l2gateway import agent_scheduler

Loading…
Cancel
Save