diff --git a/manila/exception.py b/manila/exception.py index 20c43d6c..358a2f6f 100644 --- a/manila/exception.py +++ b/manila/exception.py @@ -22,8 +22,8 @@ SHOULD include dedicated exception logging. """ -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils import six import webob.exc diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py index 5c46de82..90c33160 100644 --- a/manila/share/drivers/generic.py +++ b/manila/share/drivers/generic.py @@ -19,10 +19,10 @@ import os import re import time -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils from oslo.utils import importutils +from oslo_concurrency import processutils import six from manila.common import constants as const diff --git a/manila/tests/share/drivers/test_generic.py b/manila/tests/share/drivers/test_generic.py index 6f4d6948..cd46508f 100644 --- a/manila/tests/share/drivers/test_generic.py +++ b/manila/tests/share/drivers/test_generic.py @@ -18,8 +18,8 @@ import os import mock -from oslo.concurrency import processutils from oslo.config import cfg +from oslo_concurrency import processutils from manila.common import constants as const from manila import compute diff --git a/manila/utils.py b/manila/utils.py index c1d1fb61..4118c34d 100644 --- a/manila/utils.py +++ b/manila/utils.py @@ -38,11 +38,11 @@ from xml.sax import saxutils from eventlet import pools import netaddr -from oslo.concurrency import processutils from oslo.config import cfg from oslo.utils import excutils from oslo.utils import importutils from oslo.utils import timeutils +from oslo_concurrency import processutils import paramiko import six