openstack/manila
Code Issues Proposed changes

Use oslo.utils - remove importutils usage

Browse Source 
Use importutils from olso.utils instead of the deprecated version
from oslo-incubator.

These four files were missed in the previous change "Use oslo.utils"
with id I4f949de57e333832dcc7c1e256ce82e2db0144cb.

Change-Id: I198ea24a0512c60f11caad7cf8ae8c504442026d
This commit is contained in:
Andreas Jaeger 2014-10-22 19:53:28 +02:00 committed by Andreas Jaeger
parent 883e02f219
commit 630c08fbd4
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/compute/__init__.py
View File

@ -14,8 +14,8 @@
# under the License. # under the License.
import oslo.config.cfg import oslo.config.cfg
import oslo.utils.importutils
import manila.openstack.common.importutils
_compute_opts = [ _compute_opts = [
oslo.config.cfg.StrOpt('compute_api_class', oslo.config.cfg.StrOpt('compute_api_class',
@ -28,7 +28,7 @@ oslo.config.cfg.CONF.register_opts(_compute_opts)
def API(): def API():
importutils = manila.openstack.common.importutils importutils = oslo.utils.importutils
compute_api_class = oslo.config.cfg.CONF.compute_api_class compute_api_class = oslo.config.cfg.CONF.compute_api_class
cls = importutils.import_class(compute_api_class) cls = importutils.import_class(compute_api_class)
return cls() return cls()

5
manila/network/__init__.py
View File

@ -15,8 +15,7 @@
import abc import abc
from oslo.config import cfg from oslo.config import cfg
import oslo.utils.importutils
import manila.openstack.common.importutils
network_opts = [ network_opts = [
cfg.StrOpt('network_api_class', cfg.StrOpt('network_api_class',
@ -29,7 +28,7 @@ cfg.CONF.register_opts(network_opts)
def API(): def API():
importutils = manila.openstack.common.importutils importutils = oslo.utils.importutils
network_api_class = cfg.CONF.network_api_class network_api_class = cfg.CONF.network_api_class
cls = importutils.import_class(network_api_class) cls = importutils.import_class(network_api_class)
return cls() return cls()

3
manila/share/__init__.py
View File

@ -16,8 +16,9 @@
# Importing full names to not pollute the namespace and cause possible # Importing full names to not pollute the namespace and cause possible
# collisions with use of 'from manila.share import <foo>' elsewhere. # collisions with use of 'from manila.share import <foo>' elsewhere.
import oslo.utils.importutils as import_utils
from manila.common import config from manila.common import config
import manila.openstack.common.importutils as import_utils
CONF = config.CONF CONF = config.CONF

5
manila/volume/__init__.py
View File

@ -14,8 +14,7 @@
# under the License. # under the License.
import oslo.config.cfg import oslo.config.cfg
import oslo.utils.importutils
import manila.openstack.common.importutils
_volume_opts = [ _volume_opts = [
oslo.config.cfg.StrOpt('volume_api_class', oslo.config.cfg.StrOpt('volume_api_class',
@ -28,7 +27,7 @@ oslo.config.cfg.CONF.register_opts(_volume_opts)
def API(): def API():
importutils = manila.openstack.common.importutils importutils = oslo.utils.importutils
volume_api_class = oslo.config.cfg.CONF.volume_api_class volume_api_class = oslo.config.cfg.CONF.volume_api_class
cls = importutils.import_class(volume_api_class) cls = importutils.import_class(volume_api_class)
return cls() return cls()