Browse Source

Merge "use common agent topics from neutron-lib"

Zuul 1 year ago
parent
commit
843ab06a76

+ 1
- 1
networking_hyperv/neutron/agent/base.py View File

@@ -19,7 +19,7 @@ import abc
19 19
 import threading
20 20
 import time
21 21
 
22
-from neutron.common import topics
22
+from neutron_lib.agent import topics
23 23
 from neutron_lib import context as neutron_context
24 24
 from os_win import utilsfactory
25 25
 from oslo_log import log as logging

+ 1
- 1
networking_hyperv/neutron/agent/hnv_metadata_agent.py View File

@@ -20,10 +20,10 @@ import sys
20 20
 import httplib2
21 21
 from neutron.agent import rpc as agent_rpc
22 22
 from neutron.common import config as common_config
23
-from neutron.common import topics
24 23
 from neutron.conf.agent import common as neutron_config
25 24
 from neutron.conf.agent.metadata import config as meta_config
26 25
 from neutron import wsgi
26
+from neutron_lib.agent import topics
27 27
 from neutron_lib import constants
28 28
 from neutron_lib import context
29 29
 from oslo_log import log as logging

+ 1
- 1
networking_hyperv/neutron/agent/hyperv_neutron_agent.py View File

@@ -22,8 +22,8 @@ from neutron.agent import rpc as agent_rpc
22 22
 from neutron.agent import securitygroups_rpc as sg_agent_rpc
23 23
 from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
24 24
 from neutron.common import config as common_config
25
-from neutron.common import topics
26 25
 from neutron.conf.agent import common as neutron_config
26
+from neutron_lib.agent import topics
27 27
 from os_win import exceptions
28 28
 from os_win import utilsfactory
29 29
 from oslo_log import log as logging

+ 1
- 1
networking_hyperv/neutron/agent/layer2.py View File

@@ -23,7 +23,7 @@ import eventlet
23 23
 from eventlet import tpool
24 24
 from neutron.agent import rpc as agent_rpc
25 25
 from neutron.common import rpc as n_rpc
26
-from neutron.common import topics
26
+from neutron_lib.agent import topics
27 27
 from neutron_lib import constants as n_const
28 28
 from os_win import constants as os_win_const
29 29
 from os_win import exceptions as os_win_exc

+ 1
- 1
networking_hyperv/tests/unit/neutron/agent/test_hnv_metadata_agent.py View File

@@ -16,8 +16,8 @@ import sys
16 16
 
17 17
 import mock
18 18
 from neutron.agent import rpc as agent_rpc
19
-from neutron.common import topics
20 19
 from neutron import wsgi
20
+from neutron_lib.agent import topics
21 21
 from oslo_config import cfg
22 22
 import webob
23 23
 

+ 1
- 1
networking_hyperv/tests/unit/neutron/agent/test_hyperv_neutron_agent.py View File

@@ -24,7 +24,7 @@ import ddt
24 24
 import mock
25 25
 from neutron.agent import rpc as agent_rpc
26 26
 from neutron.common import rpc as n_rpc
27
-from neutron.common import topics
27
+from neutron_lib.agent import topics
28 28
 from os_win import exceptions
29 29
 
30 30
 from networking_hyperv.neutron.agent import hyperv_neutron_agent as \

+ 1
- 1
networking_hyperv/tests/unit/neutron/agent/test_layer2.py View File

@@ -22,8 +22,8 @@ import mock
22 22
 
23 23
 import ddt
24 24
 import neutron
25
-from neutron.common import topics
26 25
 from neutron.conf.agent import common as neutron_config
26
+from neutron_lib.agent import topics
27 27
 from os_win import constants as os_win_const
28 28
 from os_win import exceptions as os_win_exc
29 29
 

Loading…
Cancel
Save