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 removing the rehomed module from neutron
and using the module from neutron-lib instead.

NeutronLibImpact

Change-Id: Ia4a4604c259ce862597de80c6deeb3d408bf0e95

neutron/agent/dhcp/agent.py

@@ -18,6 +18,7 @@ import os
 
 import eventlet
 from neutron_lib.agent import constants as agent_consts
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib import context
 from neutron_lib import exceptions
@@ -38,7 +39,6 @@ from neutron.agent.metadata import driver as metadata_driver
 from neutron.agent import rpc as agent_rpc
 from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.common import utils
 from neutron import manager
 

neutron/agent/dhcp_agent.py

@@ -16,11 +16,11 @@
 
 import sys
 
+from neutron_lib.agent import topics
 from oslo_config import cfg
 from oslo_service import service
 
 from neutron.common import config as common_config
-from neutron.common import topics
 from neutron.conf.agent import common as config
 from neutron.conf.agent import dhcp as dhcp_config
 from neutron.conf.agent.metadata import config as meta_conf

neutron/agent/l3/agent.py

@@ -16,6 +16,7 @@
 import eventlet
 import netaddr
 from neutron_lib.agent import constants as agent_consts
+from neutron_lib.agent import topics
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
@@ -54,7 +55,6 @@ from neutron.common import constants as l3_constants
 from neutron.common import exceptions as n_exc
 from neutron.common import ipv6_utils
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.common import utils
 from neutron import manager
 

neutron/agent/l3_agent.py

@@ -16,11 +16,11 @@
 
 import sys
 
+from neutron_lib.agent import topics
 from oslo_config import cfg
 from oslo_service import service
 
 from neutron.common import config as common_config
-from neutron.common import topics
 from neutron.conf.agent import common as config
 from neutron.conf.agent.l3 import config as l3_config
 from neutron.conf.agent.l3 import ha as ha_conf

neutron/agent/metadata/agent.py

@@ -16,6 +16,7 @@ import hashlib
 import hmac
 
 import httplib2
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib import context
 from oslo_config import cfg
@@ -33,7 +34,6 @@ from neutron.agent import rpc as agent_rpc
 from neutron.common import cache_utils as cache
 from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.conf.agent.metadata import config
 
 LOG = logging.getLogger(__name__)

neutron/agent/rpc.py

@@ -17,6 +17,7 @@ from datetime import datetime
 import itertools
 
 import netaddr
+from neutron_lib.agent import topics
 from neutron_lib.callbacks import events as callback_events
 from neutron_lib.callbacks import registry
 from neutron_lib import constants
@@ -28,7 +29,6 @@ from neutron.agent import resource_cache
 from neutron.api.rpc.callbacks import resources
 from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron import objects
 
 LOG = logging.getLogger(__name__)

neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.api import extensions
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
@@ -24,7 +25,6 @@ from oslo_log import log as logging
 import oslo_messaging
 
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 
 
 LOG = logging.getLogger(__name__)

neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py

@@ -15,6 +15,7 @@
 
 import random
 
+from neutron_lib.agent import topics
 from neutron_lib.api import extensions
 from neutron_lib import constants
 from neutron_lib.plugins import constants as plugin_constants
@@ -24,7 +25,6 @@ import oslo_messaging
 
 from neutron.api.rpc.agentnotifiers import utils as ag_utils
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 
 
 LOG = logging.getLogger(__name__)

neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.api import extensions
 from neutron_lib import constants
 from neutron_lib.plugins import constants as plugin_constants
@@ -20,7 +21,6 @@ from oslo_log import log as logging
 import oslo_messaging
 
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import agentschedulers_db
 
 LOG = logging.getLogger(__name__)

neutron/api/rpc/handlers/dvr_rpc.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.plugins import directory
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
@@ -20,7 +21,6 @@ import oslo_messaging
 
 from neutron.common import constants
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 
 LOG = logging.getLogger(__name__)
 

neutron/api/rpc/handlers/resources_rpc.py

@@ -15,6 +15,7 @@
 
 import collections
 
+from neutron_lib.agent import topics
 from neutron_lib import exceptions
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
@@ -28,7 +29,6 @@ from neutron.api.rpc.callbacks import resources
 from neutron.api.rpc.callbacks import version_manager
 from neutron.common import constants
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.objects import base as obj_base
 
 LOG = logging.getLogger(__name__)

neutron/api/rpc/handlers/securitygroups_rpc.py

@@ -14,6 +14,7 @@
 
 import collections
 
+from neutron_lib.agent import topics
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.plugins import directory
@@ -24,7 +25,6 @@ import oslo_messaging
 from neutron.api.rpc.handlers import resources_rpc
 from neutron.common import constants
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import securitygroups_rpc_base as sg_rpc_base
 
 LOG = logging.getLogger(__name__)

neutron/common/topics.py

@@ -1,60 +0,0 @@
-# Copyright (c) 2012 OpenStack Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-NETWORK = 'network'
-SUBNET = 'subnet'
-PORT = 'port'
-SECURITY_GROUP = 'security_group'
-L2POPULATION = 'l2population'
-DVR = 'dvr'
-RESOURCES = 'resources'
-
-CREATE = 'create'
-DELETE = 'delete'
-UPDATE = 'update'
-
-AGENT = 'q-agent-notifier'
-PLUGIN = 'q-plugin'
-SERVER_RESOURCE_VERSIONS = 'q-server-resource-versions'
-L3PLUGIN = 'q-l3-plugin'
-REPORTS = 'q-reports-plugin'
-DHCP = 'q-dhcp-notifer'
-METERING_PLUGIN = 'q-metering-plugin'
-
-L3_AGENT = 'l3_agent'
-DHCP_AGENT = 'dhcp_agent'
-METERING_AGENT = 'metering_agent'
-
-RESOURCE_TOPIC_PATTERN = "neutron-vo-%(resource_type)s-%(version)s"
-
-
-def get_topic_name(prefix, table, operation, host=None):
-    """Create a topic name.
-
-    The topic name needs to be synced between the agent and the
-    plugin. The plugin will send a fanout message to all of the
-    listening agents so that the agents in turn can perform their
-    updates accordingly.
-
-    :param prefix: Common prefix for the plugin/agent message queues.
-    :param table: The table in question (NETWORK, SUBNET, PORT).
-    :param operation: The operation that invokes notification (CREATE,
-                      DELETE, UPDATE)
-    :param host: Add host to the topic
-    :returns: The topic name.
-    """
-    if host:
-        return '%s-%s-%s.%s' % (prefix, table, operation, host)
-    return '%s-%s-%s' % (prefix, table, operation)

neutron/plugins/ml2/drivers/agent/_common_agent.py

@@ -20,6 +20,7 @@ import sys
 import time
 
 from neutron_lib.agent import constants as agent_consts
+from neutron_lib.agent import topics
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources as local_resources
@@ -38,7 +39,6 @@ from neutron.agent import securitygroups_rpc as agent_sg_rpc
 from neutron.api.rpc.callbacks import resources
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import config as common_config
-from neutron.common import topics
 from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
 from neutron.plugins.ml2.drivers.agent import capabilities
 from neutron.plugins.ml2.drivers.agent import config as cagt_config  # noqa

neutron/plugins/ml2/drivers/l2pop/rpc.py

@@ -15,11 +15,11 @@
 
 import collections
 
+from neutron_lib.agent import topics
 from oslo_log import log as logging
 import oslo_messaging
 
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 
 
 LOG = logging.getLogger(__name__)

neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py

@@ -22,6 +22,7 @@
 import sys
 
 import netaddr
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib.utils import helpers
 from oslo_config import cfg
@@ -37,7 +38,6 @@ from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import config as common_config
 from neutron.common import exceptions
 from neutron.common import profiler as setup_profiler
-from neutron.common import topics
 from neutron.common import utils
 from neutron.conf.agent import common as agent_config
 from neutron.plugins.common import utils as p_utils

neutron/plugins/ml2/drivers/macvtap/agent/macvtap_neutron_agent.py

@@ -17,6 +17,7 @@
 import os
 import sys
 
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib.utils import helpers
 from oslo_config import cfg
@@ -27,7 +28,6 @@ from oslo_service import service
 from neutron.agent.linux import ip_lib
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import config as common_config
-from neutron.common import topics
 from neutron.conf.plugins.ml2.drivers import macvtap as config
 from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
 from neutron.plugins.ml2.drivers.agent import _common_agent as ca

neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py

@@ -20,6 +20,7 @@ import socket
 import sys
 import time
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import portbindings
 from neutron_lib import constants as n_constants
 from neutron_lib import context
@@ -39,7 +40,6 @@ from neutron.api.rpc.callbacks import resources
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import config as common_config
 from neutron.common import profiler as setup_profiler
-from neutron.common import topics
 from neutron.plugins.ml2.drivers.mech_sriov.agent.common import config
 from neutron.plugins.ml2.drivers.mech_sriov.agent.common \
     import exceptions as exc

neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py

@@ -23,6 +23,7 @@ import time
 
 import netaddr
 from neutron_lib.agent import constants as agent_consts
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import portbindings
 from neutron_lib.callbacks import events as callback_events
 from neutron_lib.callbacks import registry
@@ -52,7 +53,6 @@ from neutron.api.rpc.callbacks import resources
 from neutron.api.rpc.handlers import dvr_rpc
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import config
-from neutron.common import topics
 from neutron.common import utils as n_utils
 from neutron.conf.agent import xenapi_conf
 from neutron.plugins.common import utils as p_utils

neutron/plugins/ml2/drivers/type_tunnel.py

@@ -17,6 +17,7 @@ import itertools
 import operator
 
 import netaddr
+from neutron_lib.agent import topics
 from neutron_lib import constants as p_const
 from neutron_lib import context
 from neutron_lib import exceptions as exc
@@ -29,7 +30,6 @@ from six import moves
 from sqlalchemy import or_
 
 from neutron._i18n import _
-from neutron.common import topics
 from neutron.db import api as db_api
 from neutron.objects import base as base_obj
 from neutron.plugins.common import utils as plugin_utils

neutron/plugins/ml2/plugin.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from eventlet import greenthread
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef
 from neutron_lib.api.definitions import availability_zone as az_def
 from neutron_lib.api.definitions import extra_dhcp_opt as edo_ext
@@ -61,7 +62,6 @@ from neutron.api.rpc.handlers import resources_rpc
 from neutron.api.rpc.handlers import securitygroups_rpc
 from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.common import utils
 from neutron.db import _model_query as model_query
 from neutron.db import _resource_extend as resource_extend

neutron/plugins/ml2/rpc.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import port_security as psec
 from neutron_lib.api.definitions import portbindings
 from neutron_lib.callbacks import resources
@@ -27,7 +28,6 @@ from sqlalchemy.orm import exc
 from neutron.api.rpc.handlers import dvr_rpc
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import l3_hamode_db
 from neutron.db import provisioning_blocks
 from neutron.plugins.ml2 import db as ml2_db

neutron/services/l3_router/l3_router_plugin.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import l3 as l3_apidef
 from neutron_lib import constants as n_const
 from neutron_lib.plugins import constants as plugin_constants
@@ -25,7 +26,6 @@ from oslo_utils import importutils
 from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
 from neutron.api.rpc.handlers import l3_rpc
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import common_db_mixin
 from neutron.db import dns_db

neutron/services/metering/agents/metering_agent.py

@@ -14,6 +14,7 @@
 
 import sys
 
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib import context
 from neutron_lib.utils import runtime
@@ -30,7 +31,6 @@ from neutron.agent import rpc as agent_rpc
 from neutron.common import config as common_config
 from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.conf.agent import common as config
 from neutron.conf.services import metering_agent
 from neutron import manager

neutron/services/metering/metering_plugin.py

@@ -12,11 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import metering as metering_apidef
 
 from neutron.api.rpc.agentnotifiers import metering_rpc_agent_api
 from neutron.common import rpc as n_rpc
-from neutron.common import topics
 from neutron.db.metering import metering_db
 from neutron.db.metering import metering_rpc
 from neutron import service

neutron/tests/common/helpers.py

@@ -18,6 +18,7 @@ import functools
 import os
 import random
 
+from neutron_lib.agent import topics
 from neutron_lib import constants
 from neutron_lib import context
 from oslo_utils import timeutils
@@ -26,7 +27,6 @@ import testtools
 
 import neutron
 from neutron.agent.common import ovs_lib
-from neutron.common import topics
 from neutron.db import agents_db
 from neutron.db import common_db_mixin
 

neutron/tests/functional/services/l3_router/test_l3_dvr_ha_router_plugin.py

@@ -13,12 +13,12 @@
 #    under the License.
 
 import mock
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import external_net as extnet_apidef
 from neutron_lib.api.definitions import l3 as l3_apidef
 from neutron_lib.api.definitions import portbindings
 from neutron_lib import constants
 
-from neutron.common import topics
 from neutron.tests.common import helpers
 from neutron.tests.functional.services.l3_router import \
     test_l3_dvr_router_plugin

neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py

@@ -13,6 +13,7 @@
 #    under the License.
 
 import mock
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import external_net as extnet_apidef
 from neutron_lib.api.definitions import l3 as l3_apidef
 from neutron_lib.api.definitions import portbindings
@@ -25,7 +26,6 @@ from neutron_lib import context
 
 from neutron.api.rpc.handlers import l3_rpc
 from neutron.common import constants as n_const
-from neutron.common import topics
 from neutron.tests.common import helpers
 from neutron.tests.unit.plugins.ml2 import base as ml2_test_base
 

neutron/tests/unit/api/rpc/handlers/test_resources_rpc.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import mock
+from neutron_lib.agent import topics
 from neutron_lib import context
 from oslo_utils import uuidutils
 from oslo_versionedobjects import fields as obj_fields
@@ -22,7 +23,6 @@ import testtools
 from neutron.api.rpc.callbacks import resources
 from neutron.api.rpc.callbacks import version_manager
 from neutron.api.rpc.handlers import resources_rpc
-from neutron.common import topics
 from neutron.objects import base as objects_base
 from neutron.objects import common_types
 from neutron.tests import base

neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py

@@ -15,6 +15,7 @@
 
 import mock
 
+from neutron_lib.agent import topics
 from neutron_lib.api.definitions import port as port_def
 from neutron_lib.api.definitions import portbindings
 from neutron_lib.api.definitions import provider_net as pnet
@@ -27,7 +28,6 @@ from oslo_serialization import jsonutils
 import testtools
 
 from neutron.common import constants as n_const
-from neutron.common import topics
 from neutron.db import agents_db
 from neutron.db import common_db_mixin
 from neutron.db import l3_agentschedulers_db

neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py

@@ -18,13 +18,13 @@ import os
 import sys
 
 import mock
+from neutron_lib.agent import topics
 from neutron_lib.utils import helpers
 from oslo_config import cfg
 from oslo_service import service
 
 from neutron.agent.linux import ip_lib
 from neutron.common import config as common_config
-from neutron.common import topics
 from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
 from neutron.plugins.ml2.drivers.macvtap.agent import macvtap_neutron_agent
 from neutron.plugins.ml2.drivers.macvtap import macvtap_common

neutron/tests/unit/plugins/ml2/test_rpc.py

@@ -20,6 +20,7 @@ Unit Tests for ml2 rpc
 import collections
 
 import mock
+from neutron_lib.agent import topics
 from neutron_lib.callbacks import resources
 from neutron_lib import constants
 from neutron_lib.plugins import constants as plugin_constants
@@ -30,7 +31,6 @@ from oslo_context import context as oslo_context
 from sqlalchemy.orm import exc
 
 from neutron.agent import rpc as agent_rpc
-from neutron.common import topics
 from neutron.db import provisioning_blocks
 from neutron.plugins.ml2 import db as ml2_db
 from neutron.plugins.ml2.drivers import type_tunnel