diff --git a/manila/compute/__init__.py b/manila/compute/__init__.py index 69f0fee598..fa569dc9e7 100644 --- a/manila/compute/__init__.py +++ b/manila/compute/__init__.py @@ -14,8 +14,8 @@ # under the License. import oslo.config.cfg +import oslo.utils.importutils -import manila.openstack.common.importutils _compute_opts = [ oslo.config.cfg.StrOpt('compute_api_class', @@ -28,7 +28,7 @@ oslo.config.cfg.CONF.register_opts(_compute_opts) def API(): - importutils = manila.openstack.common.importutils + importutils = oslo.utils.importutils compute_api_class = oslo.config.cfg.CONF.compute_api_class cls = importutils.import_class(compute_api_class) return cls() diff --git a/manila/network/__init__.py b/manila/network/__init__.py index fedc0a2856..706449792d 100644 --- a/manila/network/__init__.py +++ b/manila/network/__init__.py @@ -15,8 +15,7 @@ import abc from oslo.config import cfg - -import manila.openstack.common.importutils +import oslo.utils.importutils network_opts = [ cfg.StrOpt('network_api_class', @@ -29,7 +28,7 @@ cfg.CONF.register_opts(network_opts) def API(): - importutils = manila.openstack.common.importutils + importutils = oslo.utils.importutils network_api_class = cfg.CONF.network_api_class cls = importutils.import_class(network_api_class) return cls() diff --git a/manila/share/__init__.py b/manila/share/__init__.py index b5bc58e474..7d6bfad18c 100644 --- a/manila/share/__init__.py +++ b/manila/share/__init__.py @@ -16,8 +16,9 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from manila.share import ' elsewhere. +import oslo.utils.importutils as import_utils + from manila.common import config -import manila.openstack.common.importutils as import_utils CONF = config.CONF diff --git a/manila/volume/__init__.py b/manila/volume/__init__.py index bba8f4c98e..7aa43eca20 100644 --- a/manila/volume/__init__.py +++ b/manila/volume/__init__.py @@ -14,8 +14,7 @@ # under the License. import oslo.config.cfg - -import manila.openstack.common.importutils +import oslo.utils.importutils _volume_opts = [ oslo.config.cfg.StrOpt('volume_api_class', @@ -28,7 +27,7 @@ oslo.config.cfg.CONF.register_opts(_volume_opts) def API(): - importutils = manila.openstack.common.importutils + importutils = oslo.utils.importutils volume_api_class = oslo.config.cfg.CONF.volume_api_class cls = importutils.import_class(volume_api_class) return cls()