Merge "use plugin common utils from neutron-lib"

neutron_vpnaas/db/vpn/vpn_db.py

@@ -16,7 +16,6 @@
 
 from neutron.db import common_db_mixin as base_db
 from neutron.db import models_v2
-from neutron.plugins.common import utils
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
@@ -24,6 +23,7 @@ from neutron_lib import constants as lib_constants
 from neutron_lib.exceptions import l3 as l3_exception
 from neutron_lib.plugins import constants as p_constants
 from neutron_lib.plugins import directory
+from neutron_lib.plugins import utils
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import uuidutils

neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py

@@ -15,10 +15,10 @@
 import collections
 
 from neutron.common import rpc as n_rpc
-from neutron.plugins.common import utils as plugin_utils
 from neutron_lib import constants
 from neutron_lib import context as ctx
 from neutron_lib import exceptions as nexception
+from neutron_lib.plugins import utils as plugin_utils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging

neutron_vpnaas/services/vpn/device_drivers/ipsec.py

@@ -26,10 +26,10 @@ 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.plugins.common import utils as plugin_utils
 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.utils import file as file_utils
 from oslo_concurrency import lockutils
 from oslo_config import cfg