Obsolete oslo-incubator modules - importutils

This change is part of a multi-part change set to handle obsolete and
graduated oslo modules. This change addresses import utils that is now
part of oslo.utils.

The file importutils is not being deleted because of dependencies
within oslo-incubator

Partial-Bug: #1380789
Change-Id: I8bd0275c2fb33fc3ebcea578a2746bfe755ce1e8
blueprint: retire-unused-oslo-incubator-modules

openstack-common.conf

@@ -7,7 +7,6 @@ module=exception
 module=excutils
 module=fileutils
 module=gettextutils
-module=importutils
 module=iniparser
 module=jsonutils
 module=local

requirements.txt

@@ -28,6 +28,7 @@ jsonschema>=2.0.0,<3.0.0
 Jinja2>=2.6  # BSD License (3 clause)
 pexpect>=3.1 # ISC License
 oslo.config>=1.4.0  # Apache-2.0
+oslo.utils>=1.0.0
 MySQL-python
 Babel>=1.3
 six>=1.7.0

trove/common/limits.py

@@ -26,9 +26,10 @@ import time
 import webob.dec
 import webob.exc
 
+from oslo.utils import importutils
+
 from trove.common import cfg
 from trove.common import wsgi as base_wsgi
-from trove.openstack.common import importutils
 from trove.openstack.common import jsonutils
 from trove.openstack.common import wsgi
 from trove.openstack.common.gettextutils import _

trove/common/models.py

@@ -15,7 +15,7 @@
 
 """Model classes that form the core of instances functionality."""
 
-from trove.openstack.common.importutils import import_class
+from oslo.utils.importutils import import_class
 from trove.common import remote
 from trove.common import cfg
 

trove/common/remote.py

@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.utils.importutils import import_class
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common import strategy
-from trove.openstack.common.importutils import import_class
 
 from cinderclient.v2 import client as CinderClient
 from heatclient.v1 import client as HeatClient

trove/common/rpc/service.py

@@ -19,7 +19,7 @@
 import inspect
 import os
 
-from trove.openstack.common import importutils
+from oslo.utils import importutils
 from trove.openstack.common import loopingcall
 from trove.openstack.common.rpc import service as rpc_service
 from trove.common import cfg

trove/common/utils.py

@@ -29,9 +29,10 @@ from eventlet import greenthread
 from eventlet.timeout import Timeout
 from passlib import utils as passlib_utils
 
+from oslo.utils import importutils
+
 from trove.common import cfg
 from trove.common import exception
-from trove.openstack.common import importutils
 from trove.openstack.common import log as logging
 from trove.openstack.common import processutils
 from trove.openstack.common import timeutils

trove/quota/quota.py

@@ -15,11 +15,12 @@
 
 """Quotas for DB instances and resources."""
 
+from oslo.config import cfg
+from oslo.utils import importutils
+
 from trove.openstack.common import log as logging
 from trove.openstack.common.gettextutils import _
-from oslo.config import cfg
 from trove.common import exception
-from trove.openstack.common import importutils
 from trove.quota.models import Quota
 from trove.quota.models import QuotaUsage
 from trove.quota.models import Reservation

trove/taskmanager/manager.py

@@ -14,13 +14,14 @@
 #    under the License.
 from trove.common.context import TroveContext
 
+from oslo.utils import importutils
+
 from trove.backup.models import Backup
 import trove.common.cfg as cfg
 from trove.common import exception
 from trove.common import strategy
 import trove.extensions.mgmt.instances.models as mgmtmodels
 from trove.openstack.common import log as logging
-from trove.openstack.common import importutils
 from trove.openstack.common import periodic_task
 from trove.taskmanager import models
 from trove.taskmanager.models import FreshInstanceTasks