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: I34fb241499445e2a462b10815a26b79bded0fb78
This commit is contained in:
parent
2a81af0b7f
commit
cd1fef8a81
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
|
||||
from neutron.common import topics
|
||||
from neutron_lib.agent import topics
|
||||
from neutron_lib import constants as const
|
||||
|
||||
from vmware_nsx.dhcp_meta import nsx as nsx_svc
|
||||
|
@ -15,6 +15,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
from neutron_lib.agent import topics
|
||||
from neutron_lib import constants as const
|
||||
from oslo_concurrency import lockutils
|
||||
from oslo_config import cfg
|
||||
@ -25,7 +26,6 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
|
||||
from neutron.api.rpc.handlers import dhcp_rpc
|
||||
from neutron.api.rpc.handlers import metadata_rpc
|
||||
from neutron.common import rpc as n_rpc
|
||||
from neutron.common import topics
|
||||
from neutron.db import agents_db
|
||||
|
||||
from vmware_nsx._i18n import _
|
||||
|
@ -18,6 +18,7 @@ import uuid
|
||||
|
||||
import netaddr
|
||||
|
||||
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 external_net as extnet_apidef
|
||||
@ -60,7 +61,6 @@ from sqlalchemy.orm import exc as sa_exc
|
||||
from neutron.api import extensions as neutron_extensions
|
||||
from neutron.common import ipv6_utils
|
||||
from neutron.common import rpc as n_rpc
|
||||
from neutron.common import topics
|
||||
from neutron.common import utils as n_utils
|
||||
from neutron.db import _resource_extend as resource_extend
|
||||
from neutron.db import _utils as db_utils
|
||||
|
@ -14,6 +14,7 @@
|
||||
# under the License.
|
||||
|
||||
import netaddr
|
||||
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 external_net as extnet_apidef
|
||||
@ -33,7 +34,6 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
|
||||
from neutron.api.rpc.handlers import dhcp_rpc
|
||||
from neutron.api.rpc.handlers import metadata_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 _utils as db_utils
|
||||
from neutron.db import agents_db
|
||||
|
Loading…
Reference in New Issue
Block a user