Browse Source

Merge "use plugin common utils from neutron-lib"

Zuul 1 year ago
parent
commit
de0f5e9a8e

+ 1
- 1
networking_vsphere/agent/ovsvapp_agent.py View File

@@ -28,12 +28,12 @@ import six
28 28
 from neutron_lib.agent import topics
29 29
 from neutron_lib import constants as p_const
30 30
 from neutron_lib import context
31
+from neutron_lib.plugins import utils as p_utils
31 32
 from neutron_lib.utils import helpers
32 33
 
33 34
 from neutron.agent.common import ovs_lib
34 35
 from neutron.agent import rpc as agent_rpc
35 36
 from neutron.common import rpc as n_rpc
36
-from neutron.plugins.common import utils as p_utils
37 37
 from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants as ovs_const  # noqa
38 38
 from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent as ovs_agent  # noqa
39 39
 from neutron.plugins.ml2.drivers.openvswitch.agent import vlanmanager

+ 1
- 1
networking_vsphere/tests/unit/agent/test_ovsvapp_agent.py View File

@@ -22,6 +22,7 @@ import logging
22 22
 from oslo_config import cfg
23 23
 
24 24
 from neutron_lib import constants as p_const
25
+from neutron_lib.plugins import utils as p_utils
25 26
 from neutron_lib.utils import helpers
26 27
 
27 28
 from networking_vsphere.agent import ovsvapp_agent
@@ -32,7 +33,6 @@ from networking_vsphere.tests.unit.drivers import fake_manager
32 33
 from networking_vsphere.utils import resource_util
33 34
 
34 35
 from neutron.agent.common import ovs_lib
35
-from neutron.plugins.common import utils as p_utils
36 36
 from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent as ovs_agent  # noqa
37 37
 from neutron.plugins.ml2.drivers.openvswitch.agent import vlanmanager
38 38
 

Loading…
Cancel
Save