use common rpc and exceptions from neutron-lib

The neutron.common.rpc and exceptions were rehomed into neutron-lib and
are currently shimmed in neutron [1]

This patch consumes those modules from neutron-lib by using lib's
modules rather than neutrons.

[1] https://review.openstack.org/#/c/586525/

Change-Id: Ic2839a32ec742bf25c9414650c24f17b91ae44c3
This commit is contained in:
Boden R 2018-09-26 09:28:19 -06:00
parent d1d60b93bc
commit 7434a1e5eb
4 changed files with 4 additions and 4 deletions

View File

@ -26,11 +26,11 @@ import jinja2
import netaddr
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils as agent_utils
from neutron.common import rpc as n_rpc
from neutron_lib.api import validators
from neutron_lib import constants
from neutron_lib import context
from neutron_lib.plugins import utils as plugin_utils
from neutron_lib import rpc as n_rpc
from neutron_lib.utils import file as file_utils
from oslo_concurrency import lockutils
from oslo_config import cfg

View File

@ -15,9 +15,9 @@
import abc
from neutron.common import rpc as n_rpc
from neutron_lib.plugins import constants
from neutron_lib.plugins import directory
from neutron_lib import rpc as n_rpc
from oslo_log import log as logging
import oslo_messaging
import six

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import rpc as n_rpc
from neutron_lib import rpc as n_rpc
from neutron_vpnaas.services.vpn.common import topics
from neutron_vpnaas.services.vpn.service_drivers import base_ipsec

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import rpc as n_rpc
from neutron_lib import rpc as n_rpc
from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
from neutron_vpnaas.services.vpn.service_drivers import ipsec_validator