From eea8d651b2eaf265713ce4a9e5899089c7090e4b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Thu, 9 Oct 2014 16:21:49 +0200
Subject: [PATCH] Migrate to oslo.utils
The following modules are removed:
- excutils,
- importutils,
- network_utils,
- strutils,
- timeutils.
Closes-Bug: #1385355
Change-Id: I1f34f17f5dbf37032584008f27e65d4dc4d475f4
---
neutron/db/vpn/vpn_db.py | 2 +-
neutron/services/vpn/agent.py | 3 ++-
openstack-common.conf | 5 -----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/neutron/db/vpn/vpn_db.py b/neutron/db/vpn/vpn_db.py
index 678320024..c32f98486 100644
--- a/neutron/db/vpn/vpn_db.py
+++ b/neutron/db/vpn/vpn_db.py
@@ -14,6 +14,7 @@
# under the License.
import netaddr
+from oslo.utils import excutils
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
@@ -27,7 +28,6 @@ from neutron.db import models_v2
from neutron.db.vpn import vpn_validator
from neutron.extensions import vpnaas
from neutron import manager
-from neutron.openstack.common import excutils
from neutron.openstack.common.gettextutils import _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
diff --git a/neutron/services/vpn/agent.py b/neutron/services/vpn/agent.py
index 6f67ccf1f..62807bb17 100644
--- a/neutron/services/vpn/agent.py
+++ b/neutron/services/vpn/agent.py
@@ -12,11 +12,12 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+
from oslo.config import cfg
+from oslo.utils import importutils
from neutron.agent import l3_agent
from neutron.extensions import vpnaas
-from neutron.openstack.common import importutils
vpn_agent_opts = [
cfg.MultiStrOpt(
diff --git a/openstack-common.conf b/openstack-common.conf
index 2eb0022ff..250aac48a 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -3,11 +3,9 @@
module=cache
module=context
module=eventlet_backdoor
-module=excutils
module=fileutils
module=fixture
module=gettextutils
-module=importutils
module=install_venv_common
module=local
module=lockutils
@@ -19,15 +17,12 @@ module=middleware.correlation_id
module=middleware.debug
module=middleware.request_id
module=middleware.sizelimit
-module=network_utils
module=periodic_task
module=policy
module=processutils
module=service
-module=strutils
module=systemd
module=threadgroup
-module=timeutils
module=uuidutils
# The base module to hold the copy of openstack.common