From 7d341e267fff4f5e396ff93b8443ed07d9e695ac Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 10 Nov 2014 16:53:18 +0800 Subject: [PATCH] Use oslo.utils oslo.utils library now provides the functionality previously in oslo-incubator's excutils, importutils, network_utils, strutils timeutils, units etc. Some of these outdated modules will still be around for a while until all other oslo modules that use them have been updated in future commits. Change-Id: Idee8600dfe42e5977b8fb824e91afff7e9119981 --- cinder/api/contrib/admin_actions.py | 2 +- cinder/api/contrib/hosts.py | 2 +- cinder/api/contrib/qos_specs_manage.py | 2 +- cinder/api/contrib/quotas.py | 2 +- cinder/api/contrib/services.py | 2 +- cinder/api/contrib/volume_actions.py | 2 +- cinder/api/extensions.py | 2 +- cinder/api/v1/limits.py | 2 +- cinder/api/v1/snapshots.py | 2 +- cinder/api/v2/limits.py | 2 +- cinder/api/v2/snapshots.py | 2 +- cinder/api/views/limits.py | 2 +- cinder/backup/__init__.py | 4 +- cinder/backup/api.py | 2 +- cinder/backup/drivers/ceph.py | 43 ++--- cinder/backup/drivers/swift.py | 6 +- cinder/backup/manager.py | 4 +- cinder/brick/local_dev/lvm.py | 3 +- cinder/compute/__init__.py | 3 +- cinder/consistencygroup/__init__.py | 4 +- cinder/consistencygroup/api.py | 4 +- cinder/context.py | 3 +- cinder/db/base.py | 3 +- cinder/db/sqlalchemy/api.py | 2 +- cinder/db/sqlalchemy/models.py | 3 +- cinder/image/glance.py | 3 +- cinder/image/image_utils.py | 4 +- cinder/keymgr/__init__.py | 3 +- cinder/keymgr/barbican.py | 2 +- cinder/openstack/common/network_utils.py | 160 ------------------ cinder/openstack/common/units.py | 38 ----- cinder/quota.py | 4 +- cinder/replication/__init__.py | 5 +- cinder/scheduler/driver.py | 4 +- cinder/scheduler/flows/create_volume.py | 2 +- cinder/scheduler/host_manager.py | 2 +- cinder/scheduler/manager.py | 4 +- cinder/scheduler/scheduler_options.py | 2 +- cinder/service.py | 2 +- cinder/test.py | 4 +- .../tests/api/contrib/test_admin_actions.py | 2 +- .../api/contrib/test_availability_zones.py | 2 +- cinder/tests/api/contrib/test_backups.py | 2 +- cinder/tests/api/contrib/test_hosts.py | 2 +- cinder/tests/api/contrib/test_services.py | 2 +- cinder/tests/api/fakes.py | 2 +- cinder/tests/api/v1/test_types.py | 2 +- cinder/tests/api/v2/test_types.py | 2 +- cinder/tests/scheduler/fakes.py | 3 +- cinder/tests/scheduler/test_host_manager.py | 4 +- cinder/tests/scheduler/test_scheduler.py | 2 +- cinder/tests/test_backup.py | 4 +- cinder/tests/test_coraid.py | 2 +- cinder/tests/test_drivers_compatibility.py | 2 +- cinder/tests/test_fusionio_ioControl.py | 4 +- cinder/tests/test_glusterfs.py | 2 +- cinder/tests/test_gpfs.py | 2 +- cinder/tests/test_hp3par.py | 2 +- cinder/tests/test_hplefthand.py | 2 +- cinder/tests/test_ibmnas.py | 2 +- cinder/tests/test_image_utils.py | 2 +- cinder/tests/test_nexenta.py | 2 +- cinder/tests/test_nfs.py | 2 +- cinder/tests/test_prophetstor_dpl.py | 2 +- cinder/tests/test_pure.py | 2 +- cinder/tests/test_quota.py | 2 +- cinder/tests/test_rbd.py | 4 +- cinder/tests/test_replication.py | 2 +- cinder/tests/test_scality.py | 2 +- cinder/tests/test_sheepdog.py | 3 +- cinder/tests/test_solidfire.py | 4 +- cinder/tests/test_storwize_svc.py | 6 +- cinder/tests/test_utils.py | 4 +- cinder/tests/test_vmware_datastore.py | 2 +- cinder/tests/test_vmware_vmdk.py | 2 +- cinder/tests/test_vmware_volumeops.py | 2 +- cinder/tests/test_volume.py | 6 +- cinder/tests/test_volume_utils.py | 2 +- cinder/tests/test_zfssa.py | 3 +- .../zonemanager/test_brcd_fc_zone_driver.py | 2 +- .../zonemanager/test_cisco_fc_zone_driver.py | 2 +- cinder/transfer/__init__.py | 5 +- cinder/transfer/api.py | 2 +- cinder/utils.py | 4 +- cinder/volume/__init__.py | 4 +- cinder/volume/api.py | 4 +- cinder/volume/driver.py | 2 +- cinder/volume/drivers/coraid.py | 2 +- cinder/volume/drivers/datera.py | 2 +- cinder/volume/drivers/emc/emc_vnx_cli.py | 4 +- cinder/volume/drivers/eqlx.py | 2 +- .../drivers/fujitsu_eternus_dx_common.py | 2 +- cinder/volume/drivers/fusionio/ioControl.py | 2 +- cinder/volume/drivers/glusterfs.py | 2 +- cinder/volume/drivers/hds/hds.py | 2 +- cinder/volume/drivers/hds/hnas_backend.py | 3 +- cinder/volume/drivers/hds/iscsi.py | 4 +- cinder/volume/drivers/hds/nfs.py | 4 +- .../volume/drivers/hitachi/hbsd_basiclib.py | 2 +- cinder/volume/drivers/hitachi/hbsd_common.py | 2 +- cinder/volume/drivers/hitachi/hbsd_fc.py | 2 +- cinder/volume/drivers/hitachi/hbsd_horcm.py | 2 +- cinder/volume/drivers/huawei/rest_common.py | 5 +- cinder/volume/drivers/huawei/ssh_common.py | 3 +- cinder/volume/drivers/ibm/gpfs.py | 2 +- cinder/volume/drivers/ibm/ibmnas.py | 2 +- .../drivers/ibm/storwize_svc/__init__.py | 4 +- .../drivers/ibm/storwize_svc/helpers.py | 4 +- cinder/volume/drivers/ibm/xiv_ds8k.py | 2 +- cinder/volume/drivers/lvm.py | 2 +- cinder/volume/drivers/netapp/common.py | 2 +- cinder/volume/drivers/netapp/eseries/iscsi.py | 4 +- cinder/volume/drivers/netapp/iscsi.py | 6 +- cinder/volume/drivers/netapp/nfs.py | 4 +- cinder/volume/drivers/netapp/ssc_utils.py | 2 +- cinder/volume/drivers/netapp/utils.py | 2 +- cinder/volume/drivers/nexenta/nfs.py | 3 +- cinder/volume/drivers/nexenta/utils.py | 2 +- cinder/volume/drivers/nfs.py | 2 +- cinder/volume/drivers/nimble.py | 2 +- .../volume/drivers/prophetstor/dplcommon.py | 2 +- cinder/volume/drivers/pure.py | 4 +- cinder/volume/drivers/rbd.py | 46 ++--- cinder/volume/drivers/remotefs.py | 2 +- .../volume/drivers/san/hp/hp_3par_common.py | 6 +- .../drivers/san/hp/hp_lefthand_cliq_proxy.py | 2 +- .../drivers/san/hp/hp_lefthand_rest_proxy.py | 2 +- cinder/volume/drivers/san/san.py | 2 +- cinder/volume/drivers/scality.py | 2 +- cinder/volume/drivers/sheepdog.py | 2 +- cinder/volume/drivers/smbfs.py | 2 +- cinder/volume/drivers/solidfire.py | 4 +- cinder/volume/drivers/vmware/datastore.py | 3 +- cinder/volume/drivers/vmware/vmdk.py | 4 +- cinder/volume/drivers/vmware/volumeops.py | 3 +- cinder/volume/drivers/windows/smbfs.py | 2 +- cinder/volume/drivers/zfssa/zfssaiscsi.py | 2 +- cinder/volume/flows/api/create_volume.py | 4 +- cinder/volume/flows/manager/create_volume.py | 2 +- cinder/volume/manager.py | 6 +- cinder/volume/utils.py | 6 +- cinder/wsgi.py | 14 +- .../brocade/brcd_fc_san_lookup_service.py | 2 +- .../brocade/brcd_fc_zone_client_cli.py | 2 +- .../drivers/brocade/brcd_fc_zone_driver.py | 4 +- .../cisco/cisco_fc_san_lookup_service.py | 2 +- .../drivers/cisco/cisco_fc_zone_client_cli.py | 2 +- .../drivers/cisco/cisco_fc_zone_driver.py | 4 +- cinder/zonemanager/fc_san_lookup_service.py | 3 +- cinder/zonemanager/fc_zone_manager.py | 2 +- openstack-common.conf | 3 - requirements.txt | 1 + 152 files changed, 260 insertions(+), 450 deletions(-) delete mode 100644 cinder/openstack/common/network_utils.py delete mode 100644 cinder/openstack/common/units.py diff --git a/cinder/api/contrib/admin_actions.py b/cinder/api/contrib/admin_actions.py index 16fe9902dcd..964af7b3802 100644 --- a/cinder/api/contrib/admin_actions.py +++ b/cinder/api/contrib/admin_actions.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import strutils import webob from webob import exc @@ -22,7 +23,6 @@ from cinder import db from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils from cinder import rpc from cinder import volume diff --git a/cinder/api/contrib/hosts.py b/cinder/api/contrib/hosts.py index af458bfae28..47bd6b06fef 100644 --- a/cinder/api/contrib/hosts.py +++ b/cinder/api/contrib/hosts.py @@ -18,6 +18,7 @@ from xml.parsers import expat from oslo.config import cfg +from oslo.utils import timeutils import webob.exc from cinder.api import extensions @@ -27,7 +28,6 @@ from cinder import db from cinder import exception from cinder.i18n import _, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import utils from cinder.volume import api as volume_api diff --git a/cinder/api/contrib/qos_specs_manage.py b/cinder/api/contrib/qos_specs_manage.py index b48ce41b4fb..062d1f6d679 100644 --- a/cinder/api/contrib/qos_specs_manage.py +++ b/cinder/api/contrib/qos_specs_manage.py @@ -15,6 +15,7 @@ """The QoS specs extension""" +from oslo.utils import strutils import six import webob @@ -25,7 +26,6 @@ from cinder.api import xmlutil from cinder import exception from cinder.i18n import _, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils from cinder import rpc from cinder import utils from cinder.volume import qos_specs diff --git a/cinder/api/contrib/quotas.py b/cinder/api/contrib/quotas.py index a7de8d5366c..121224fefdc 100644 --- a/cinder/api/contrib/quotas.py +++ b/cinder/api/contrib/quotas.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import strutils import webob from cinder.api import extensions @@ -22,7 +23,6 @@ from cinder import db from cinder.db.sqlalchemy import api as sqlalchemy_api from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import strutils from cinder import quota diff --git a/cinder/api/contrib/services.py b/cinder/api/contrib/services.py index 88a40869901..0e58d65f244 100644 --- a/cinder/api/contrib/services.py +++ b/cinder/api/contrib/services.py @@ -15,6 +15,7 @@ from oslo.config import cfg +from oslo.utils import timeutils import webob.exc from cinder.api import extensions @@ -24,7 +25,6 @@ from cinder import db from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import utils diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py index 24dcb9cf47d..fd4bc1f8b08 100644 --- a/cinder/api/contrib/volume_actions.py +++ b/cinder/api/contrib/volume_actions.py @@ -14,6 +14,7 @@ from oslo import messaging +from oslo.utils import strutils import webob from cinder.api import extensions @@ -22,7 +23,6 @@ from cinder.api import xmlutil from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils from cinder import utils from cinder import volume diff --git a/cinder/api/extensions.py b/cinder/api/extensions.py index c37b5070255..6eff5abedff 100644 --- a/cinder/api/extensions.py +++ b/cinder/api/extensions.py @@ -17,6 +17,7 @@ import os from oslo.config import cfg +from oslo.utils import importutils import webob.dec import webob.exc @@ -25,7 +26,6 @@ from cinder.api.openstack import wsgi from cinder.api import xmlutil from cinder import exception from cinder.i18n import _, _LE, _LI -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging import cinder.policy diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py index de45e99aac7..0f44c7b7b4e 100644 --- a/cinder/api/v1/limits.py +++ b/cinder/api/v1/limits.py @@ -25,6 +25,7 @@ import re import time from oslo.serialization import jsonutils +from oslo.utils import importutils import webob.dec import webob.exc @@ -32,7 +33,6 @@ from cinder.api.openstack import wsgi from cinder.api.views import limits as limits_views from cinder.api import xmlutil from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder import quota from cinder import wsgi as base_wsgi diff --git a/cinder/api/v1/snapshots.py b/cinder/api/v1/snapshots.py index 918dcb35943..016d1e44701 100644 --- a/cinder/api/v1/snapshots.py +++ b/cinder/api/v1/snapshots.py @@ -15,6 +15,7 @@ """The volumes snapshots api.""" +from oslo.utils import strutils import webob from webob import exc @@ -24,7 +25,6 @@ from cinder.api import xmlutil from cinder import exception from cinder.i18n import _, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils from cinder import utils from cinder import volume diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py index 5fba22076c9..e89393d900b 100644 --- a/cinder/api/v2/limits.py +++ b/cinder/api/v2/limits.py @@ -25,6 +25,7 @@ import re import time from oslo.serialization import jsonutils +from oslo.utils import importutils import webob.dec import webob.exc @@ -32,7 +33,6 @@ from cinder.api.openstack import wsgi from cinder.api.views import limits as limits_views from cinder.api import xmlutil from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder import quota from cinder import wsgi as base_wsgi diff --git a/cinder/api/v2/snapshots.py b/cinder/api/v2/snapshots.py index f7c76b9ccee..64d1d284367 100644 --- a/cinder/api/v2/snapshots.py +++ b/cinder/api/v2/snapshots.py @@ -15,6 +15,7 @@ """The volumes snapshots api.""" +from oslo.utils import strutils import webob from webob import exc @@ -24,7 +25,6 @@ from cinder.api import xmlutil from cinder import exception from cinder.i18n import _, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils from cinder import utils from cinder import volume diff --git a/cinder/api/views/limits.py b/cinder/api/views/limits.py index dba14d6efe2..b676f10efee 100644 --- a/cinder/api/views/limits.py +++ b/cinder/api/views/limits.py @@ -15,7 +15,7 @@ import datetime -from cinder.openstack.common import timeutils +from oslo.utils import timeutils class ViewBuilder(object): diff --git a/cinder/backup/__init__.py b/cinder/backup/__init__.py index 354580f362e..7482eb458a5 100644 --- a/cinder/backup/__init__.py +++ b/cinder/backup/__init__.py @@ -16,11 +16,11 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from cinder.backup import ' elsewhere. +from oslo.utils import importutils from cinder.common import config -import cinder.openstack.common.importutils CONF = config.CONF -API = cinder.openstack.common.importutils.import_class(CONF.backup_api_class) +API = importutils.import_class(CONF.backup_api_class) diff --git a/cinder/backup/api.py b/cinder/backup/api.py index 094c0313bc9..2b52d6d2ae4 100644 --- a/cinder/backup/api.py +++ b/cinder/backup/api.py @@ -20,13 +20,13 @@ Handles all requests relating to the volume backups service. from eventlet import greenthread from oslo.config import cfg +from oslo.utils import excutils from cinder.backup import rpcapi as backup_rpcapi from cinder import context from cinder.db import base from cinder import exception from cinder.i18n import _, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging import cinder.policy from cinder import quota diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py index d36e22f579f..86b969213d3 100644 --- a/cinder/backup/drivers/ceph.py +++ b/cinder/backup/drivers/ceph.py @@ -50,14 +50,14 @@ import time import eventlet from oslo.config import cfg +from oslo.utils import encodeutils +from oslo.utils import excutils +from oslo.utils import units from cinder.backup.driver import BackupDriver from cinder import exception from cinder.i18n import _, _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils -from cinder.openstack.common import units from cinder import utils import cinder.volume.drivers.rbd as rbd_driver @@ -103,7 +103,7 @@ class VolumeMetadataBackup(object): @property def name(self): - return strutils.safe_encode("backup.%s.meta" % self._backup_id) + return encodeutils.safe_encode("backup.%s.meta" % self._backup_id) @property def exists(self): @@ -182,9 +182,9 @@ class CephBackupDriver(BackupDriver): self.rbd_stripe_count = 0 self.rbd_stripe_unit = 0 - self._ceph_backup_user = strutils.safe_encode(CONF.backup_ceph_user) - self._ceph_backup_pool = strutils.safe_encode(CONF.backup_ceph_pool) - self._ceph_backup_conf = strutils.safe_encode(CONF.backup_ceph_conf) + self._ceph_backup_user = encodeutils.safe_encode(CONF.backup_ceph_user) + self._ceph_backup_pool = encodeutils.safe_encode(CONF.backup_ceph_pool) + self._ceph_backup_conf = encodeutils.safe_encode(CONF.backup_ceph_conf) def _validate_string_args(self, *args): """Ensure all args are non-None and non-empty.""" @@ -240,7 +240,8 @@ class CephBackupDriver(BackupDriver): conffile=self._ceph_backup_conf) try: client.connect() - pool_to_open = strutils.safe_encode(pool or self._ceph_backup_pool) + pool_to_open = encodeutils.safe_encode(pool or + self._ceph_backup_pool) ioctx = client.open_ioctx(pool_to_open) return client, ioctx except self.rados.Error: @@ -263,13 +264,13 @@ class CephBackupDriver(BackupDriver): """ # Ensure no unicode if diff_format: - return strutils.safe_encode("volume-%s.backup.base" % volume_id) + return encodeutils.safe_encode("volume-%s.backup.base" % volume_id) else: if backup_id is None: msg = _("Backup id required") raise exception.InvalidParameterValue(msg) - return strutils.safe_encode("volume-%s.backup.%s" % - (volume_id, backup_id)) + return encodeutils.safe_encode("volume-%s.backup.%s" % + (volume_id, backup_id)) def _discard_bytes(self, volume, offset, length): """Trim length bytes from offset. @@ -472,7 +473,7 @@ class CephBackupDriver(BackupDriver): # Since we have deleted the base image we can delete the source # volume backup snapshot. - src_name = strutils.safe_encode(volume_id) + src_name = encodeutils.safe_encode(volume_id) if src_name in self.rbd.RBD().list(client.ioctx): LOG.debug("Deleting source volume snapshot '%(snapshot)s' " "for backup %(basename)s." % @@ -537,15 +538,15 @@ class CephBackupDriver(BackupDriver): if from_snap is not None: cmd1.extend(['--from-snap', from_snap]) if src_snap: - path = strutils.safe_encode("%s/%s@%s" % - (src_pool, src_name, src_snap)) + path = encodeutils.safe_encode("%s/%s@%s" % + (src_pool, src_name, src_snap)) else: - path = strutils.safe_encode("%s/%s" % (src_pool, src_name)) + path = encodeutils.safe_encode("%s/%s" % (src_pool, src_name)) cmd1.extend([path, '-']) cmd2 = ['rbd', 'import-diff'] + dest_ceph_args - rbd_path = strutils.safe_encode("%s/%s" % (dest_pool, dest_name)) + rbd_path = encodeutils.safe_encode("%s/%s" % (dest_pool, dest_name)) cmd2.extend(['-', rbd_path]) ret, stderr = self._piped_execute(cmd1, cmd2) @@ -758,8 +759,8 @@ class CephBackupDriver(BackupDriver): return backup_snaps def _get_new_snap_name(self, backup_id): - return strutils.safe_encode("backup.%s.snap.%s" % - (backup_id, time.time())) + return encodeutils.safe_encode("backup.%s.snap.%s" % + (backup_id, time.time())) def _get_backup_snap_name(self, rbd_image, name, backup_id): """Return the name of the snapshot associated with backup_id. @@ -933,7 +934,7 @@ class CephBackupDriver(BackupDriver): with rbd_driver.RADOSClient(self, self._ceph_backup_pool) as client: adjust_size = 0 base_image = self.rbd.Image(client.ioctx, - strutils.safe_encode(backup_base), + encodeutils.safe_encode(backup_base), read_only=True) try: if restore_length != base_image.size(): @@ -943,8 +944,8 @@ class CephBackupDriver(BackupDriver): if adjust_size: with rbd_driver.RADOSClient(self, src_pool) as client: - dest_image = self.rbd.Image(client.ioctx, - strutils.safe_encode(restore_vol)) + restore_vol_encode = encodeutils.safe_encode(restore_vol) + dest_image = self.rbd.Image(client.ioctx, restore_vol_encode) try: LOG.debug("Adjusting restore vol size") dest_image.resize(adjust_size) diff --git a/cinder/backup/drivers/swift.py b/cinder/backup/drivers/swift.py index d98f0de39c4..5fb423d159e 100644 --- a/cinder/backup/drivers/swift.py +++ b/cinder/backup/drivers/swift.py @@ -38,16 +38,16 @@ import socket import eventlet from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import timeutils +from oslo.utils import units import six from swiftclient import client as swift from cinder.backup.driver import BackupDriver from cinder import exception from cinder.i18n import _, _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units LOG = logging.getLogger(__name__) diff --git a/cinder/backup/manager.py b/cinder/backup/manager.py index 80b72bfed7b..5ca7b7b39d6 100644 --- a/cinder/backup/manager.py +++ b/cinder/backup/manager.py @@ -35,6 +35,8 @@ Volume backups can be created, restored, deleted and listed. from oslo.config import cfg from oslo import messaging +from oslo.utils import excutils +from oslo.utils import importutils from cinder.backup import driver from cinder.backup import rpcapi as backup_rpcapi @@ -42,8 +44,6 @@ from cinder import context from cinder import exception from cinder.i18n import _, _LE, _LI, _LW from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder import quota from cinder import rpc diff --git a/cinder/brick/local_dev/lvm.py b/cinder/brick/local_dev/lvm.py index 562fd761a62..2612b9bc808 100644 --- a/cinder/brick/local_dev/lvm.py +++ b/cinder/brick/local_dev/lvm.py @@ -22,10 +22,11 @@ import math import re import time +from oslo.utils import excutils + from cinder.brick import exception from cinder.brick import executor from cinder.i18n import _, _LE, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils diff --git a/cinder/compute/__init__.py b/cinder/compute/__init__.py index c70d1410999..b3cdf137ab3 100644 --- a/cinder/compute/__init__.py +++ b/cinder/compute/__init__.py @@ -14,8 +14,8 @@ # under the License. import oslo.config.cfg +from oslo.utils import importutils -import cinder.openstack.common.importutils _compute_opts = [ oslo.config.cfg.StrOpt('compute_api_class', @@ -28,7 +28,6 @@ oslo.config.cfg.CONF.register_opts(_compute_opts) def API(): - importutils = cinder.openstack.common.importutils compute_api_class = oslo.config.cfg.CONF.compute_api_class cls = importutils.import_class(compute_api_class) return cls() diff --git a/cinder/consistencygroup/__init__.py b/cinder/consistencygroup/__init__.py index f89791d320d..efa3bc0e12e 100644 --- a/cinder/consistencygroup/__init__.py +++ b/cinder/consistencygroup/__init__.py @@ -16,12 +16,12 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from cinder.transfer import ' elsewhere. +from oslo.utils import importutils from cinder.common import config -import cinder.openstack.common.importutils CONF = config.CONF -API = cinder.openstack.common.importutils.import_class( +API = importutils.import_class( CONF.consistencygroup_api_class) diff --git a/cinder/consistencygroup/api.py b/cinder/consistencygroup/api.py index a4dfead0fbe..fb55e74eca0 100644 --- a/cinder/consistencygroup/api.py +++ b/cinder/consistencygroup/api.py @@ -21,13 +21,13 @@ Handles all requests relating to consistency groups. import functools from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import timeutils from cinder.db import base from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils import cinder.policy from cinder import quota from cinder.scheduler import rpcapi as scheduler_rpcapi diff --git a/cinder/context.py b/cinder/context.py index 5a826891f9d..a67c6426f60 100644 --- a/cinder/context.py +++ b/cinder/context.py @@ -20,10 +20,11 @@ import copy import uuid +from oslo.utils import timeutils + from cinder.i18n import _ from cinder.openstack.common import local from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import policy diff --git a/cinder/db/base.py b/cinder/db/base.py index da51fdde13d..3ba467467ca 100644 --- a/cinder/db/base.py +++ b/cinder/db/base.py @@ -18,8 +18,7 @@ from oslo.config import cfg - -from cinder.openstack.common import importutils +from oslo.utils import importutils db_driver_opt = cfg.StrOpt('db_driver', diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index da249da26c7..b37e35c5731 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -30,6 +30,7 @@ from oslo.config import cfg from oslo.db import exception as db_exc from oslo.db import options from oslo.db.sqlalchemy import session as db_session +from oslo.utils import timeutils import osprofiler.sqlalchemy import sqlalchemy from sqlalchemy import or_ @@ -43,7 +44,6 @@ from cinder.db.sqlalchemy import models from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder.openstack.common import uuidutils diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py index 6ae1505bcd9..2c5b8d079f5 100644 --- a/cinder/db/sqlalchemy/models.py +++ b/cinder/db/sqlalchemy/models.py @@ -21,13 +21,12 @@ SQLAlchemy models for cinder data. from oslo.config import cfg from oslo.db.sqlalchemy import models +from oslo.utils import timeutils from sqlalchemy import Column, Integer, String, Text, schema from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey, DateTime, Boolean from sqlalchemy.orm import relationship, backref, validates -from cinder.openstack.common import timeutils - CONF = cfg.CONF BASE = declarative_base() diff --git a/cinder/image/glance.py b/cinder/image/glance.py index 1a1334069c5..efed24aac02 100644 --- a/cinder/image/glance.py +++ b/cinder/image/glance.py @@ -29,12 +29,13 @@ import time import glanceclient.exc from oslo.config import cfg from oslo.serialization import jsonutils +from oslo.utils import timeutils import six.moves.urllib.parse as urlparse from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils + glance_opts = [ cfg.ListOpt('allowed_direct_url_schemes', diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index 3d280a3ca41..ebd89b8985d 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -29,6 +29,8 @@ import os import tempfile from oslo.config import cfg +from oslo.utils import timeutils +from oslo.utils import units from cinder import exception from cinder.i18n import _ @@ -36,8 +38,6 @@ from cinder.openstack.common import fileutils from cinder.openstack.common import imageutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import utils from cinder.volume import utils as volume_utils diff --git a/cinder/keymgr/__init__.py b/cinder/keymgr/__init__.py index 84daca4e53c..d1123081738 100644 --- a/cinder/keymgr/__init__.py +++ b/cinder/keymgr/__init__.py @@ -14,8 +14,7 @@ # under the License. from oslo.config import cfg - -from cinder.openstack.common import importutils +from oslo.utils import importutils keymgr_opts = [ cfg.StrOpt('api_class', diff --git a/cinder/keymgr/barbican.py b/cinder/keymgr/barbican.py index afbf41cd0d7..d32e4d8327c 100644 --- a/cinder/keymgr/barbican.py +++ b/cinder/keymgr/barbican.py @@ -25,12 +25,12 @@ from barbicanclient import client as barbican_client from keystoneclient.auth import identity from keystoneclient import session from oslo.config import cfg +from oslo.utils import excutils from cinder import exception from cinder.i18n import _ from cinder.keymgr import key as keymgr_key from cinder.keymgr import key_mgr -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging CONF = cfg.CONF diff --git a/cinder/openstack/common/network_utils.py b/cinder/openstack/common/network_utils.py deleted file mode 100644 index 7672116b5b6..00000000000 --- a/cinder/openstack/common/network_utils.py +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 2012 OpenStack Foundation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Network-related utilities and helper functions. -""" - -import socket - -from six.moves.urllib import parse - -from cinder.openstack.common.gettextutils import _LW -from cinder.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - - -def parse_host_port(address, default_port=None): - """Interpret a string as a host:port pair. - - An IPv6 address MUST be escaped if accompanied by a port, - because otherwise ambiguity ensues: 2001:db8:85a3::8a2e:370:7334 - means both [2001:db8:85a3::8a2e:370:7334] and - [2001:db8:85a3::8a2e:370]:7334. - - >>> parse_host_port('server01:80') - ('server01', 80) - >>> parse_host_port('server01') - ('server01', None) - >>> parse_host_port('server01', default_port=1234) - ('server01', 1234) - >>> parse_host_port('[::1]:80') - ('::1', 80) - >>> parse_host_port('[::1]') - ('::1', None) - >>> parse_host_port('[::1]', default_port=1234) - ('::1', 1234) - >>> parse_host_port('2001:db8:85a3::8a2e:370:7334', default_port=1234) - ('2001:db8:85a3::8a2e:370:7334', 1234) - - """ - if address[0] == '[': - # Escaped ipv6 - _host, _port = address[1:].split(']') - host = _host - if ':' in _port: - port = _port.split(':')[1] - else: - port = default_port - else: - if address.count(':') == 1: - host, port = address.split(':') - else: - # 0 means ipv4, >1 means ipv6. - # We prohibit unescaped ipv6 addresses with port. - host = address - port = default_port - - return (host, None if port is None else int(port)) - - -class ModifiedSplitResult(parse.SplitResult): - """Split results class for urlsplit.""" - - # NOTE(dims): The functions below are needed for Python 2.6.x. - # We can remove these when we drop support for 2.6.x. - @property - def hostname(self): - netloc = self.netloc.split('@', 1)[-1] - host, port = parse_host_port(netloc) - return host - - @property - def port(self): - netloc = self.netloc.split('@', 1)[-1] - host, port = parse_host_port(netloc) - return port - - -def urlsplit(url, scheme='', allow_fragments=True): - """Parse a URL using urlparse.urlsplit(), splitting query and fragments. - This function papers over Python issue9374 when needed. - - The parameters are the same as urlparse.urlsplit. - """ - scheme, netloc, path, query, fragment = parse.urlsplit( - url, scheme, allow_fragments) - if allow_fragments and '#' in path: - path, fragment = path.split('#', 1) - if '?' in path: - path, query = path.split('?', 1) - return ModifiedSplitResult(scheme, netloc, - path, query, fragment) - - -def set_tcp_keepalive(sock, tcp_keepalive=True, - tcp_keepidle=None, - tcp_keepalive_interval=None, - tcp_keepalive_count=None): - """Set values for tcp keepalive parameters - - This function configures tcp keepalive parameters if users wish to do - so. - :param tcp_keepalive: Boolean, turn on or off tcp_keepalive. If users are - not sure, this should be True, and default values will be used. - - :param tcp_keepidle: time to wait before starting to send keepalive probes - - :param tcp_keepalive_interval: time between successive probes, once the - initial wait time is over - - :param tcp_keepalive_count: number of probes to send before the connection - is killed - """ - - # NOTE(praneshp): Despite keepalive being a tcp concept, the level is - # still SOL_SOCKET. This is a quirk. - if isinstance(tcp_keepalive, bool): - sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, tcp_keepalive) - else: - raise TypeError("tcp_keepalive must be a boolean") - - if not tcp_keepalive: - return - - # These options aren't available in the OS X version of eventlet, - # Idle + Count * Interval effectively gives you the total timeout. - if tcp_keepidle is not None: - if hasattr(socket, 'TCP_KEEPIDLE'): - sock.setsockopt(socket.IPPROTO_TCP, - socket.TCP_KEEPIDLE, - tcp_keepidle) - else: - LOG.warning(_LW('tcp_keepidle not available on your system')) - if tcp_keepalive_interval is not None: - if hasattr(socket, 'TCP_KEEPINTVL'): - sock.setsockopt(socket.IPPROTO_TCP, - socket.TCP_KEEPINTVL, - tcp_keepalive_interval) - else: - LOG.warning(_LW('tcp_keepintvl not available on your system')) - if tcp_keepalive_count is not None: - if hasattr(socket, 'TCP_KEEPCNT'): - sock.setsockopt(socket.IPPROTO_TCP, - socket.TCP_KEEPCNT, - tcp_keepalive_count) - else: - LOG.warning(_LW('tcp_keepknt not available on your system')) diff --git a/cinder/openstack/common/units.py b/cinder/openstack/common/units.py deleted file mode 100644 index 84b518ca8de..00000000000 --- a/cinder/openstack/common/units.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2013 IBM Corp -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Unit constants -""" - -#Binary unit constants. -Ki = 1024 -Mi = 1024 ** 2 -Gi = 1024 ** 3 -Ti = 1024 ** 4 -Pi = 1024 ** 5 -Ei = 1024 ** 6 -Zi = 1024 ** 7 -Yi = 1024 ** 8 - -#Decimal unit constants. -k = 1000 -M = 1000 ** 2 -G = 1000 ** 3 -T = 1000 ** 4 -P = 1000 ** 5 -E = 1000 ** 6 -Z = 1000 ** 7 -Y = 1000 ** 8 diff --git a/cinder/quota.py b/cinder/quota.py index 63008874760..84756ef7f6e 100644 --- a/cinder/quota.py +++ b/cinder/quota.py @@ -20,14 +20,14 @@ import datetime from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils from cinder import context from cinder import db from cinder import exception from cinder.i18n import _, _LE -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/cinder/replication/__init__.py b/cinder/replication/__init__.py index 99f16a32a1a..a4260e809c8 100644 --- a/cinder/replication/__init__.py +++ b/cinder/replication/__init__.py @@ -14,11 +14,10 @@ from oslo.config import cfg - -import cinder.openstack.common.importutils +from oslo.utils import importutils CONF = cfg.CONF cls = CONF.replication_api_class -API = cinder.openstack.common.importutils.import_class(cls) +API = importutils.import_class(cls) diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py index 7749e3671fc..927846c394b 100644 --- a/cinder/scheduler/driver.py +++ b/cinder/scheduler/driver.py @@ -20,11 +20,11 @@ Scheduler base class that all Schedulers should inherit from """ from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils from cinder import db from cinder.i18n import _ -from cinder.openstack.common import importutils -from cinder.openstack.common import timeutils from cinder.volume import rpcapi as volume_rpcapi diff --git a/cinder/scheduler/flows/create_volume.py b/cinder/scheduler/flows/create_volume.py index 43007a4edce..4e9fcfcd3dc 100644 --- a/cinder/scheduler/flows/create_volume.py +++ b/cinder/scheduler/flows/create_volume.py @@ -10,13 +10,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.utils import excutils import taskflow.engines from taskflow.patterns import linear_flow from cinder import exception from cinder import flow_utils from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import rpc from cinder import utils diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py index 4729e235563..c7c7cdfeee7 100644 --- a/cinder/scheduler/host_manager.py +++ b/cinder/scheduler/host_manager.py @@ -20,6 +20,7 @@ Manage hosts in the current zone. import UserDict from oslo.config import cfg +from oslo.utils import timeutils from cinder import db from cinder import exception @@ -27,7 +28,6 @@ from cinder.i18n import _ from cinder.openstack.common import log as logging from cinder.openstack.common.scheduler import filters from cinder.openstack.common.scheduler import weights -from cinder.openstack.common import timeutils from cinder import utils from cinder.volume import utils as vol_utils diff --git a/cinder/scheduler/manager.py b/cinder/scheduler/manager.py index 6db095b57e9..0aeddd6ffea 100644 --- a/cinder/scheduler/manager.py +++ b/cinder/scheduler/manager.py @@ -21,6 +21,8 @@ Scheduler Service from oslo.config import cfg from oslo import messaging +from oslo.utils import excutils +from oslo.utils import importutils from cinder import context from cinder import db @@ -28,8 +30,6 @@ from cinder import exception from cinder import flow_utils from cinder.i18n import _ from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder import quota from cinder import rpc diff --git a/cinder/scheduler/scheduler_options.py b/cinder/scheduler/scheduler_options.py index 661e899eae7..970bb606898 100644 --- a/cinder/scheduler/scheduler_options.py +++ b/cinder/scheduler/scheduler_options.py @@ -25,10 +25,10 @@ import json import os from oslo.config import cfg +from oslo.utils import timeutils from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils scheduler_json_config_location_opt = cfg.StrOpt( diff --git a/cinder/service.py b/cinder/service.py index 2378c591777..bfd2f897936 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -25,6 +25,7 @@ import random from oslo.config import cfg from oslo.db import exception as db_exc from oslo import messaging +from oslo.utils import importutils import osprofiler.notifier from osprofiler import profiler import osprofiler.web @@ -33,7 +34,6 @@ from cinder import context from cinder import db from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall from cinder.openstack.common import processutils diff --git a/cinder/test.py b/cinder/test.py index 46abeb90cf1..16d4860a099 100644 --- a/cinder/test.py +++ b/cinder/test.py @@ -32,6 +32,8 @@ import mock import mox from oslo.config import cfg from oslo.messaging import conffixture as messaging_conffixture +from oslo.utils import strutils +from oslo.utils import timeutils import stubout import testtools from testtools import matchers @@ -40,8 +42,6 @@ from cinder.common import config # noqa Need to register global_opts from cinder.db import migration from cinder.db.sqlalchemy import api as sqla_api from cinder.openstack.common import log as oslo_logging -from cinder.openstack.common import strutils -from cinder.openstack.common import timeutils from cinder import rpc from cinder import service from cinder.tests import conf_fixture diff --git a/cinder/tests/api/contrib/test_admin_actions.py b/cinder/tests/api/contrib/test_admin_actions.py index e9da48fde62..727f407d6b3 100644 --- a/cinder/tests/api/contrib/test_admin_actions.py +++ b/cinder/tests/api/contrib/test_admin_actions.py @@ -15,6 +15,7 @@ import tempfile from oslo.config import cfg from oslo.serialization import jsonutils +from oslo.utils import timeutils import webob from webob import exc @@ -23,7 +24,6 @@ from cinder.brick.local_dev import lvm as brick_lvm from cinder import context from cinder import db from cinder import exception -from cinder.openstack.common import timeutils from cinder import test from cinder.tests.api import fakes from cinder.tests.api.v2 import stubs diff --git a/cinder/tests/api/contrib/test_availability_zones.py b/cinder/tests/api/contrib/test_availability_zones.py index 1c2bed8c361..06ecd88f470 100644 --- a/cinder/tests/api/contrib/test_availability_zones.py +++ b/cinder/tests/api/contrib/test_availability_zones.py @@ -16,10 +16,10 @@ import datetime from lxml import etree +from oslo.utils import timeutils import cinder.api.contrib.availability_zones import cinder.context -from cinder.openstack.common import timeutils import cinder.test import cinder.volume.api diff --git a/cinder/tests/api/contrib/test_backups.py b/cinder/tests/api/contrib/test_backups.py index f41a4f79622..b6c3a89bb07 100644 --- a/cinder/tests/api/contrib/test_backups.py +++ b/cinder/tests/api/contrib/test_backups.py @@ -21,6 +21,7 @@ import json from xml.dom import minidom import mock +from oslo.utils import timeutils import webob # needed for stubs to work @@ -30,7 +31,6 @@ from cinder import db from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import test from cinder.tests.api import fakes from cinder.tests import utils diff --git a/cinder/tests/api/contrib/test_hosts.py b/cinder/tests/api/contrib/test_hosts.py index f43dec3eeb8..8e578884801 100644 --- a/cinder/tests/api/contrib/test_hosts.py +++ b/cinder/tests/api/contrib/test_hosts.py @@ -16,13 +16,13 @@ import datetime from lxml import etree +from oslo.utils import timeutils import webob.exc from cinder.api.contrib import hosts as os_hosts from cinder import context from cinder import db from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import test diff --git a/cinder/tests/api/contrib/test_services.py b/cinder/tests/api/contrib/test_services.py index 35908849e4f..cf26ebd96ef 100644 --- a/cinder/tests/api/contrib/test_services.py +++ b/cinder/tests/api/contrib/test_services.py @@ -16,6 +16,7 @@ from datetime import datetime +from oslo.utils import timeutils import webob.exc from cinder.api.contrib import services @@ -23,7 +24,6 @@ from cinder.api import extensions from cinder import context from cinder import db from cinder import exception -from cinder.openstack.common import timeutils from cinder import policy from cinder import test from cinder.tests.api import fakes diff --git a/cinder/tests/api/fakes.py b/cinder/tests/api/fakes.py index 24e2c9a280b..0242a50ce61 100644 --- a/cinder/tests/api/fakes.py +++ b/cinder/tests/api/fakes.py @@ -15,6 +15,7 @@ import uuid +from oslo.utils import timeutils import routes import webob import webob.dec @@ -28,7 +29,6 @@ from cinder.api.v2 import limits from cinder.api.v2 import router from cinder.api import versions from cinder import context -from cinder.openstack.common import timeutils from cinder import wsgi diff --git a/cinder/tests/api/v1/test_types.py b/cinder/tests/api/v1/test_types.py index 47c80be9846..844ac9c37d6 100644 --- a/cinder/tests/api/v1/test_types.py +++ b/cinder/tests/api/v1/test_types.py @@ -16,12 +16,12 @@ import uuid from lxml import etree +from oslo.utils import timeutils import webob from cinder.api.v1 import types from cinder.api.views import types as views_types from cinder import exception -from cinder.openstack.common import timeutils from cinder import test from cinder.tests.api import fakes from cinder.volume import volume_types diff --git a/cinder/tests/api/v2/test_types.py b/cinder/tests/api/v2/test_types.py index dc82b1c86ba..6d56262a394 100644 --- a/cinder/tests/api/v2/test_types.py +++ b/cinder/tests/api/v2/test_types.py @@ -16,12 +16,12 @@ import uuid from lxml import etree +from oslo.utils import timeutils import webob from cinder.api.v2 import types from cinder.api.views import types as views_types from cinder import exception -from cinder.openstack.common import timeutils from cinder import test from cinder.tests.api import fakes from cinder.volume import volume_types diff --git a/cinder/tests/scheduler/fakes.py b/cinder/tests/scheduler/fakes.py index 1ce71c34a4c..f41c6fb6275 100644 --- a/cinder/tests/scheduler/fakes.py +++ b/cinder/tests/scheduler/fakes.py @@ -16,7 +16,8 @@ Fakes For Scheduler tests. """ -from cinder.openstack.common import timeutils +from oslo.utils import timeutils + from cinder.scheduler import filter_scheduler from cinder.scheduler import host_manager diff --git a/cinder/tests/scheduler/test_host_manager.py b/cinder/tests/scheduler/test_host_manager.py index acb72726dc5..3f51d4bbd96 100644 --- a/cinder/tests/scheduler/test_host_manager.py +++ b/cinder/tests/scheduler/test_host_manager.py @@ -18,10 +18,10 @@ Tests For HostManager import mock from oslo.config import cfg +from oslo.utils import timeutils from cinder import exception from cinder.openstack.common.scheduler import filters -from cinder.openstack.common import timeutils from cinder.scheduler import host_manager from cinder import test @@ -84,7 +84,7 @@ class HostManagerTestCase(test.TestCase): self.assertEqual(expected, mock_func.call_args_list) self.assertEqual(set(result), set(self.fake_hosts)) - @mock.patch('cinder.openstack.common.timeutils.utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_update_service_capabilities(self, _mock_utcnow): service_states = self.host_manager.service_states self.assertDictMatch(service_states, {}) diff --git a/cinder/tests/scheduler/test_scheduler.py b/cinder/tests/scheduler/test_scheduler.py index c7497c98c54..5d55eccfa1a 100644 --- a/cinder/tests/scheduler/test_scheduler.py +++ b/cinder/tests/scheduler/test_scheduler.py @@ -278,7 +278,7 @@ class SchedulerDriverModuleTestCase(test.TestCase): self.context = context.RequestContext('fake_user', 'fake_project') @mock.patch('cinder.db.volume_update') - @mock.patch('cinder.openstack.common.timeutils.utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_volume_host_update_db(self, _mock_utcnow, _mock_vol_update): _mock_utcnow.return_value = 'fake-now' driver.volume_update_db(self.context, 31337, 'fake_host') diff --git a/cinder/tests/test_backup.py b/cinder/tests/test_backup.py index 02b94895648..8e30649e3d0 100644 --- a/cinder/tests/test_backup.py +++ b/cinder/tests/test_backup.py @@ -21,14 +21,14 @@ import tempfile import mock from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils from cinder.backup import manager from cinder import context from cinder import db from cinder import exception -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import test from cinder.tests.backup.fake_service_with_verify import\ get_backup_driver diff --git a/cinder/tests/test_coraid.py b/cinder/tests/test_coraid.py index bc528e1c986..b062cf782ba 100644 --- a/cinder/tests/test_coraid.py +++ b/cinder/tests/test_coraid.py @@ -20,12 +20,12 @@ import mock import mox from oslo.config import cfg from oslo.serialization import jsonutils +from oslo.utils import units from cinder.brick.initiator import connector from cinder import exception from cinder.image import image_utils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import test from cinder import utils from cinder.volume import configuration as conf diff --git a/cinder/tests/test_drivers_compatibility.py b/cinder/tests/test_drivers_compatibility.py index f517679acd7..4743f3f9250 100644 --- a/cinder/tests/test_drivers_compatibility.py +++ b/cinder/tests/test_drivers_compatibility.py @@ -14,9 +14,9 @@ from oslo.config import cfg +from oslo.utils import importutils from cinder import context -from cinder.openstack.common import importutils from cinder import test diff --git a/cinder/tests/test_fusionio_ioControl.py b/cinder/tests/test_fusionio_ioControl.py index 373d6d9aa6f..1455f991f24 100644 --- a/cinder/tests/test_fusionio_ioControl.py +++ b/cinder/tests/test_fusionio_ioControl.py @@ -17,14 +17,14 @@ import copy import json import mock +from oslo.utils import timeutils +from oslo.utils import units import requests from cinder import context from cinder.db.sqlalchemy.models import VolumeMetadata from cinder import exception from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers.fusionio.ioControl import FIOconnection diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py index d771a93a110..e839255c8cb 100644 --- a/cinder/tests/test_glusterfs.py +++ b/cinder/tests/test_glusterfs.py @@ -27,6 +27,7 @@ from mox import IgnoreArg from mox import IsA from mox import stubout from oslo.config import cfg +from oslo.utils import units from cinder import brick from cinder import compute @@ -37,7 +38,6 @@ from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import imageutils from cinder.openstack.common import processutils as putils -from cinder.openstack.common import units from cinder import test from cinder import utils from cinder.volume import configuration as conf diff --git a/cinder/tests/test_gpfs.py b/cinder/tests/test_gpfs.py index cc59139dbc5..9fd1f6abbda 100644 --- a/cinder/tests/test_gpfs.py +++ b/cinder/tests/test_gpfs.py @@ -19,13 +19,13 @@ import tempfile import mock from oslo.config import cfg +from oslo.utils import units from cinder import context from cinder import exception from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import test from cinder import utils from cinder.volume import configuration as conf diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py index 26f9526f085..ed2f9048956 100644 --- a/cinder/tests/test_hp3par.py +++ b/cinder/tests/test_hp3par.py @@ -20,11 +20,11 @@ import mock import ast from oslo.config import cfg +from oslo.utils import units from cinder import context from cinder import exception from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import test from cinder.tests import fake_hp_3par_client as hp3parclient from cinder.volume.drivers.san.hp import hp_3par_common as hpcommon diff --git a/cinder/tests/test_hplefthand.py b/cinder/tests/test_hplefthand.py index e0ec9e89d26..0e3010d7be7 100644 --- a/cinder/tests/test_hplefthand.py +++ b/cinder/tests/test_hplefthand.py @@ -15,11 +15,11 @@ # """Unit tests for OpenStack Cinder volume drivers.""" import mock +from oslo.utils import units from cinder import context from cinder import exception from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import test from cinder.tests import fake_hp_lefthand_client as hplefthandclient from cinder.volume.drivers.san.hp import hp_lefthand_iscsi diff --git a/cinder/tests/test_ibmnas.py b/cinder/tests/test_ibmnas.py index fb1e8845f9b..11b294f42df 100644 --- a/cinder/tests/test_ibmnas.py +++ b/cinder/tests/test_ibmnas.py @@ -23,11 +23,11 @@ NAS based IBM GPFS Storage Systems). import mock from oslo.config import cfg +from oslo.utils import units from cinder import context from cinder import exception from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers.ibm import ibmnas diff --git a/cinder/tests/test_image_utils.py b/cinder/tests/test_image_utils.py index 4d54559aebb..025a12a6c61 100644 --- a/cinder/tests/test_image_utils.py +++ b/cinder/tests/test_image_utils.py @@ -21,13 +21,13 @@ import tempfile import mock import mox from oslo.config import cfg +from oslo.utils import units from cinder import context from cinder import exception from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import test from cinder import utils from cinder.volume import utils as volume_utils diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py index b4468454cf8..0192db10226 100644 --- a/cinder/tests/test_nexenta.py +++ b/cinder/tests/test_nexenta.py @@ -21,10 +21,10 @@ import base64 import urllib2 import mox as mox_lib +from oslo.utils import units from cinder import context from cinder import db -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers import nexenta diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py index 9031e3ea7d4..c7a72645fbc 100644 --- a/cinder/tests/test_nfs.py +++ b/cinder/tests/test_nfs.py @@ -22,11 +22,11 @@ import mox as mox_lib from mox import IgnoreArg from mox import IsA from mox import stubout +from oslo.utils import units from cinder import context from cinder import exception from cinder.image import image_utils -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers import nfs diff --git a/cinder/tests/test_prophetstor_dpl.py b/cinder/tests/test_prophetstor_dpl.py index c390af722e5..901320100e1 100644 --- a/cinder/tests/test_prophetstor_dpl.py +++ b/cinder/tests/test_prophetstor_dpl.py @@ -17,9 +17,9 @@ import httplib import re import mock +from oslo.utils import units from cinder import exception -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers.prophetstor import dpl_iscsi as DPLDRIVER diff --git a/cinder/tests/test_pure.py b/cinder/tests/test_pure.py index 27f36b5a10e..15ef87f219a 100644 --- a/cinder/tests/test_pure.py +++ b/cinder/tests/test_pure.py @@ -17,10 +17,10 @@ import json import urllib2 import mock +from oslo.utils import units from cinder import exception from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import test from cinder.volume.drivers import pure diff --git a/cinder/tests/test_quota.py b/cinder/tests/test_quota.py index 94d40371073..aed9dd15481 100644 --- a/cinder/tests/test_quota.py +++ b/cinder/tests/test_quota.py @@ -20,6 +20,7 @@ import datetime import mock from oslo.config import cfg +from oslo.utils import timeutils from cinder import backup from cinder import context @@ -27,7 +28,6 @@ from cinder import db from cinder.db.sqlalchemy import api as sqa_api from cinder.db.sqlalchemy import models as sqa_models from cinder import exception -from cinder.openstack.common import timeutils from cinder import quota from cinder import test import cinder.tests.image.fake diff --git a/cinder/tests/test_rbd.py b/cinder/tests/test_rbd.py index 99cdfd72415..d3ac8198dca 100644 --- a/cinder/tests/test_rbd.py +++ b/cinder/tests/test_rbd.py @@ -21,14 +21,14 @@ import os import tempfile import mock +from oslo.utils import timeutils +from oslo.utils import units from cinder import db from cinder import exception from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import test from cinder.tests.image import fake as fake_image from cinder.tests.test_volume import DriverTestCase diff --git a/cinder/tests/test_replication.py b/cinder/tests/test_replication.py index 5ccec65fc7b..8da2ad400fc 100644 --- a/cinder/tests/test_replication.py +++ b/cinder/tests/test_replication.py @@ -17,11 +17,11 @@ Tests for Volume replication code. import mock from oslo.config import cfg +from oslo.utils import importutils from cinder import context from cinder import db from cinder import exception -from cinder.openstack.common import importutils from cinder import test from cinder.tests import utils as test_utils diff --git a/cinder/tests/test_scality.py b/cinder/tests/test_scality.py index d46cb43f745..b0018562140 100644 --- a/cinder/tests/test_scality.py +++ b/cinder/tests/test_scality.py @@ -22,11 +22,11 @@ import shutil import tempfile import mox as mox_lib +from oslo.utils import units from cinder import context from cinder import exception from cinder.image import image_utils -from cinder.openstack.common import units from cinder import test from cinder import utils from cinder.volume import configuration as conf diff --git a/cinder/tests/test_sheepdog.py b/cinder/tests/test_sheepdog.py index d19aad63de2..fe298fe6c59 100644 --- a/cinder/tests/test_sheepdog.py +++ b/cinder/tests/test_sheepdog.py @@ -19,9 +19,10 @@ import contextlib import os import tempfile +from oslo.utils import units + from cinder.image import image_utils from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import test from cinder.volume.drivers.sheepdog import SheepdogDriver diff --git a/cinder/tests/test_solidfire.py b/cinder/tests/test_solidfire.py index 36d85220928..1a37be387e9 100644 --- a/cinder/tests/test_solidfire.py +++ b/cinder/tests/test_solidfire.py @@ -15,12 +15,12 @@ # under the License. import mox +from oslo.utils import timeutils +from oslo.utils import units from cinder import context from cinder import exception from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers.solidfire import SolidFireDriver diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py index d75396ea72f..8c6bfb023d7 100644 --- a/cinder/tests/test_storwize_svc.py +++ b/cinder/tests/test_storwize_svc.py @@ -23,15 +23,15 @@ import re import time import mock +from oslo.utils import excutils +from oslo.utils import importutils +from oslo.utils import units from cinder import context from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import test from cinder.tests import utils as testutils from cinder import utils diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py index 70437a24e2e..7f0f7912ef7 100644 --- a/cinder/tests/test_utils.py +++ b/cinder/tests/test_utils.py @@ -22,6 +22,7 @@ import uuid import mock from oslo.config import cfg +from oslo.utils import timeutils import paramiko import six @@ -30,7 +31,6 @@ from cinder.brick.initiator import connector from cinder.brick.initiator import linuxfc from cinder import exception from cinder.openstack.common import processutils as putils -from cinder.openstack.common import timeutils from cinder import ssh_utils from cinder import test from cinder import utils @@ -390,7 +390,7 @@ class GenericUtilsTestCase(test.TestCase): self.assertEqual(fake_execute.uid, 2) self.assertEqual(fake_execute.uid, os.getuid()) - @mock.patch('cinder.openstack.common.timeutils.utcnow') + @mock.patch('oslo.utils.timeutils.utcnow') def test_service_is_up(self, mock_utcnow): fts_func = datetime.datetime.fromtimestamp fake_now = 1000 diff --git a/cinder/tests/test_vmware_datastore.py b/cinder/tests/test_vmware_datastore.py index 3b6409ac263..e5206369ffd 100644 --- a/cinder/tests/test_vmware_datastore.py +++ b/cinder/tests/test_vmware_datastore.py @@ -18,8 +18,8 @@ Unit tests for datastore module. """ import mock +from oslo.utils import units -from cinder.openstack.common import units from cinder import test from cinder.volume.drivers.vmware import datastore as ds_sel from cinder.volume.drivers.vmware import error_util diff --git a/cinder/tests/test_vmware_vmdk.py b/cinder/tests/test_vmware_vmdk.py index 82da1a0c31b..418461800f3 100644 --- a/cinder/tests/test_vmware_vmdk.py +++ b/cinder/tests/test_vmware_vmdk.py @@ -22,10 +22,10 @@ import os import mock import mox +from oslo.utils import units from cinder import exception from cinder.image import glance -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration from cinder.volume.drivers.vmware import api diff --git a/cinder/tests/test_vmware_volumeops.py b/cinder/tests/test_vmware_volumeops.py index 3aef159ac4c..8527217cd84 100644 --- a/cinder/tests/test_vmware_volumeops.py +++ b/cinder/tests/test_vmware_volumeops.py @@ -18,8 +18,8 @@ Test suite for VMware VMDK driver volumeops module. """ import mock +from oslo.utils import units -from cinder.openstack.common import units from cinder import test from cinder.volume.drivers.vmware import error_util from cinder.volume.drivers.vmware import vim_util diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py index 32628dbb61c..11e9c25e797 100644 --- a/cinder/tests/test_volume.py +++ b/cinder/tests/test_volume.py @@ -31,6 +31,9 @@ import mock import mox from oslo.config import cfg from oslo.serialization import jsonutils +from oslo.utils import importutils +from oslo.utils import timeutils +from oslo.utils import units from stevedore import extension from taskflow.engines.action_engine import engine @@ -43,10 +46,7 @@ from cinder import exception from cinder.image import image_utils from cinder import keymgr from cinder.openstack.common import fileutils -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units import cinder.policy from cinder import quota from cinder import test diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py index 04d0fc58f39..3916692fa98 100644 --- a/cinder/tests/test_volume_utils.py +++ b/cinder/tests/test_volume_utils.py @@ -20,11 +20,11 @@ import re import mock from oslo.config import cfg +from oslo.utils import importutils from cinder import context from cinder import db from cinder import exception -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import test diff --git a/cinder/tests/test_zfssa.py b/cinder/tests/test_zfssa.py index dd555d827eb..a09e00b0602 100644 --- a/cinder/tests/test_zfssa.py +++ b/cinder/tests/test_zfssa.py @@ -19,8 +19,9 @@ import mock from json import JSONEncoder +from oslo.utils import units + from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import test from cinder.volume import configuration as conf from cinder.volume.drivers.zfssa import restclient as client diff --git a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py index f3cec3a4d44..ab5133ef52c 100644 --- a/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py +++ b/cinder/tests/zonemanager/test_brcd_fc_zone_driver.py @@ -21,11 +21,11 @@ import mock from oslo.config import cfg +from oslo.utils import importutils import paramiko from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder import test from cinder.volume import configuration as conf diff --git a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py index 7083e86bce1..f0cbb9fc16d 100644 --- a/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py +++ b/cinder/tests/zonemanager/test_cisco_fc_zone_driver.py @@ -18,9 +18,9 @@ """Unit tests for Cisco FC zone driver.""" from oslo.config import cfg +from oslo.utils import importutils from cinder import exception -from cinder.openstack.common import importutils from cinder.openstack.common import processutils from cinder import test from cinder.volume import configuration as conf diff --git a/cinder/transfer/__init__.py b/cinder/transfer/__init__.py index 7a4f44547b2..7b972ac4e05 100644 --- a/cinder/transfer/__init__.py +++ b/cinder/transfer/__init__.py @@ -18,10 +18,9 @@ from oslo.config import cfg - -import cinder.openstack.common.importutils +from oslo.utils import importutils CONF = cfg.CONF -API = cinder.openstack.common.importutils.import_class(CONF.transfer_api_class) +API = importutils.import_class(CONF.transfer_api_class) diff --git a/cinder/transfer/api.py b/cinder/transfer/api.py index 6f98101620f..7065f3312d2 100644 --- a/cinder/transfer/api.py +++ b/cinder/transfer/api.py @@ -23,11 +23,11 @@ import hmac import os from oslo.config import cfg +from oslo.utils import excutils from cinder.db import base from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import quota from cinder.volume import api as volume_api diff --git a/cinder/utils.py b/cinder/utils.py index 8f27701c556..ba27646b9df 100644 --- a/cinder/utils.py +++ b/cinder/utils.py @@ -36,16 +36,16 @@ from xml.sax import expatreader from xml.sax import saxutils from oslo.config import cfg +from oslo.utils import importutils +from oslo.utils import timeutils import six from cinder.brick.initiator import connector from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import timeutils CONF = cfg.CONF diff --git a/cinder/volume/__init__.py b/cinder/volume/__init__.py index e845ea618e9..374aa8851c8 100644 --- a/cinder/volume/__init__.py +++ b/cinder/volume/__init__.py @@ -17,11 +17,11 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from cinder.volume import ' elsewhere. +from oslo.utils import importutils from cinder.common import config -import cinder.openstack.common.importutils as import_utils CONF = config.CONF -API = import_utils.import_class(CONF.volume_api_class) +API = importutils.import_class(CONF.volume_api_class) diff --git a/cinder/volume/api.py b/cinder/volume/api.py index 57c79a36710..43618de17ef 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -24,6 +24,8 @@ import datetime import functools from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import timeutils import six from cinder import context @@ -33,9 +35,7 @@ from cinder import flow_utils from cinder.i18n import _ from cinder.image import glance from cinder import keymgr -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder.openstack.common import uuidutils import cinder.policy from cinder import quota diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 6eba5d83f07..c02231e706c 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -20,11 +20,11 @@ Drivers for volumes. import time from oslo.config import cfg +from oslo.utils import excutils from cinder import exception from cinder.i18n import _, _LE from cinder.image import image_utils -from cinder.openstack.common import excutils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py index 4bafa7a1507..ab48789e17c 100644 --- a/cinder/volume/drivers/coraid.py +++ b/cinder/volume/drivers/coraid.py @@ -28,13 +28,13 @@ import urllib2 from oslo.config import cfg from oslo.serialization import jsonutils +from oslo.utils import units import six.moves.urllib.parse as urlparse from cinder import exception from cinder.i18n import _ from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume import driver from cinder.volume import volume_types diff --git a/cinder/volume/drivers/datera.py b/cinder/volume/drivers/datera.py index 6c28072b2bb..65ae3bdb15d 100644 --- a/cinder/volume/drivers/datera.py +++ b/cinder/volume/drivers/datera.py @@ -16,12 +16,12 @@ import json from oslo.config import cfg +from oslo.utils import units import requests from cinder import exception from cinder.i18n import _, _LE from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume.drivers.san import san LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py index 70810c7cd1b..eeee3877fad 100644 --- a/cinder/volume/drivers/emc/emc_vnx_cli.py +++ b/cinder/volume/drivers/emc/emc_vnx_cli.py @@ -23,17 +23,17 @@ import time from oslo.config import cfg from oslo.serialization import jsonutils as json +from oslo.utils import excutils +from oslo.utils import timeutils import six from cinder import exception from cinder.exception import EMCVnxCLICmdError from cinder.i18n import _, _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall from cinder.openstack.common import processutils -from cinder.openstack.common import timeutils from cinder import utils from cinder.volume.configuration import Configuration from cinder.volume.drivers.san import san diff --git a/cinder/volume/drivers/eqlx.py b/cinder/volume/drivers/eqlx.py index 94be9d68c5f..82e91c46b3d 100644 --- a/cinder/volume/drivers/eqlx.py +++ b/cinder/volume/drivers/eqlx.py @@ -22,10 +22,10 @@ import eventlet from eventlet import greenthread import greenlet from oslo.config import cfg +from oslo.utils import excutils from cinder import exception from cinder.i18n import _, _LE, _LW, _LI -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import ssh_utils diff --git a/cinder/volume/drivers/fujitsu_eternus_dx_common.py b/cinder/volume/drivers/fujitsu_eternus_dx_common.py index 53495f364a8..795b944ef87 100644 --- a/cinder/volume/drivers/fujitsu_eternus_dx_common.py +++ b/cinder/volume/drivers/fujitsu_eternus_dx_common.py @@ -26,13 +26,13 @@ import time from xml.dom.minidom import parseString from oslo.config import cfg +from oslo.utils import units import six from cinder import exception from cinder.i18n import _, _LE, _LW from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import units from cinder.volume import volume_types LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/fusionio/ioControl.py b/cinder/volume/drivers/fusionio/ioControl.py index b1709da45bc..e3b09856bac 100644 --- a/cinder/volume/drivers/fusionio/ioControl.py +++ b/cinder/volume/drivers/fusionio/ioControl.py @@ -24,13 +24,13 @@ import random import uuid from oslo.config import cfg +from oslo.utils import units import requests from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import units from cinder.volume.drivers.san.san import SanISCSIDriver from cinder.volume import qos_specs from cinder.volume import volume_types diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py index 9e98c1af46a..0661c054c0c 100644 --- a/cinder/volume/drivers/glusterfs.py +++ b/cinder/volume/drivers/glusterfs.py @@ -19,6 +19,7 @@ import stat import time from oslo.config import cfg +from oslo.utils import units from cinder.brick.remotefs import remotefs as remotefs_brick from cinder import compute @@ -29,7 +30,6 @@ from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers import remotefs as remotefs_drv diff --git a/cinder/volume/drivers/hds/hds.py b/cinder/volume/drivers/hds/hds.py index 9c9bca2666f..7fe55734511 100644 --- a/cinder/volume/drivers/hds/hds.py +++ b/cinder/volume/drivers/hds/hds.py @@ -22,10 +22,10 @@ iSCSI Cinder Volume driver for Hitachi Unified Storage (HUS) platform. from xml.etree import ElementTree as ETree from oslo.config import cfg +from oslo.utils import excutils from cinder import exception from cinder.i18n import _, _LE, _LI -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import utils from cinder.volume import driver diff --git a/cinder/volume/drivers/hds/hnas_backend.py b/cinder/volume/drivers/hds/hnas_backend.py index 10b9a103452..420affa64a2 100644 --- a/cinder/volume/drivers/hds/hnas_backend.py +++ b/cinder/volume/drivers/hds/hnas_backend.py @@ -20,8 +20,9 @@ Hitachi Unified Storage (HUS-HNAS) platform. Backend operations. import re +from oslo.utils import units + from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import utils LOG = logging.getLogger("cinder.volume.driver") diff --git a/cinder/volume/drivers/hds/iscsi.py b/cinder/volume/drivers/hds/iscsi.py index b89ad620174..fcb71eed708 100644 --- a/cinder/volume/drivers/hds/iscsi.py +++ b/cinder/volume/drivers/hds/iscsi.py @@ -21,12 +21,12 @@ iSCSI Cinder Volume driver for Hitachi Unified Storage (HUS-HNAS) platform. from xml.etree import ElementTree as ETree from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import exception from cinder.i18n import _LE, _LI -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume import driver from cinder.volume.drivers.hds.hnas_backend import HnasBackend from cinder.volume import utils diff --git a/cinder/volume/drivers/hds/nfs.py b/cinder/volume/drivers/hds/nfs.py index 66b408837f2..a4694f802a8 100644 --- a/cinder/volume/drivers/hds/nfs.py +++ b/cinder/volume/drivers/hds/nfs.py @@ -22,14 +22,14 @@ import time from xml.etree import ElementTree as ETree from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import exception from cinder.i18n import _, _LE, _LI from cinder.image import image_utils -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder.volume.drivers.hds.hnas_backend import HnasBackend from cinder.volume.drivers import nfs diff --git a/cinder/volume/drivers/hitachi/hbsd_basiclib.py b/cinder/volume/drivers/hitachi/hbsd_basiclib.py index 74c5782b620..3390295f212 100644 --- a/cinder/volume/drivers/hitachi/hbsd_basiclib.py +++ b/cinder/volume/drivers/hitachi/hbsd_basiclib.py @@ -16,11 +16,11 @@ import inspect import os import shlex +from oslo.utils import excutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils diff --git a/cinder/volume/drivers/hitachi/hbsd_common.py b/cinder/volume/drivers/hitachi/hbsd_common.py index cf1e5d50bb1..6739dc1d54f 100644 --- a/cinder/volume/drivers/hitachi/hbsd_common.py +++ b/cinder/volume/drivers/hitachi/hbsd_common.py @@ -21,13 +21,13 @@ import re import threading from oslo.config import cfg +from oslo.utils import excutils import six from cinder.db.sqlalchemy import api from cinder.db.sqlalchemy import models from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import utils from cinder.volume.drivers.hitachi import hbsd_basiclib as basic_lib diff --git a/cinder/volume/drivers/hitachi/hbsd_fc.py b/cinder/volume/drivers/hitachi/hbsd_fc.py index c461e0f520c..8fb2269b96a 100644 --- a/cinder/volume/drivers/hitachi/hbsd_fc.py +++ b/cinder/volume/drivers/hitachi/hbsd_fc.py @@ -21,11 +21,11 @@ import os import threading from oslo.config import cfg +from oslo.utils import excutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import utils import cinder.volume.driver diff --git a/cinder/volume/drivers/hitachi/hbsd_horcm.py b/cinder/volume/drivers/hitachi/hbsd_horcm.py index 58ff10f1cef..34bd88bd948 100644 --- a/cinder/volume/drivers/hitachi/hbsd_horcm.py +++ b/cinder/volume/drivers/hitachi/hbsd_horcm.py @@ -21,11 +21,11 @@ import threading import time from oslo.config import cfg +from oslo.utils import excutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall from cinder.openstack.common import processutils as putils diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py index fca545d504d..d7e56f83d92 100644 --- a/cinder/volume/drivers/huawei/rest_common.py +++ b/cinder/volume/drivers/huawei/rest_common.py @@ -23,12 +23,13 @@ import urllib2 import uuid from xml.etree import ElementTree as ET +from oslo.utils import excutils +from oslo.utils import units + from cinder import context from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers.huawei import huawei_utils from cinder.volume import volume_types diff --git a/cinder/volume/drivers/huawei/ssh_common.py b/cinder/volume/drivers/huawei/ssh_common.py index 8706811c5dd..0cf026f9600 100644 --- a/cinder/volume/drivers/huawei/ssh_common.py +++ b/cinder/volume/drivers/huawei/ssh_common.py @@ -26,10 +26,11 @@ import threading import time from xml.etree import ElementTree as ET +from oslo.utils import excutils + from cinder import context from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import ssh_utils from cinder import utils diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py index e12ee4bb1e6..923458b5670 100644 --- a/cinder/volume/drivers/ibm/gpfs.py +++ b/cinder/volume/drivers/ibm/gpfs.py @@ -22,6 +22,7 @@ import re import shutil from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _ @@ -29,7 +30,6 @@ from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume import driver diff --git a/cinder/volume/drivers/ibm/ibmnas.py b/cinder/volume/drivers/ibm/ibmnas.py index 102d8e7f3ae..294af38cbc3 100644 --- a/cinder/volume/drivers/ibm/ibmnas.py +++ b/cinder/volume/drivers/ibm/ibmnas.py @@ -33,13 +33,13 @@ import os import re from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _, _LI, _LW from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers import nfs from cinder.volume.drivers.remotefs import nas_opts diff --git a/cinder/volume/drivers/ibm/storwize_svc/__init__.py b/cinder/volume/drivers/ibm/storwize_svc/__init__.py index 62d2c7d59c8..7adbf4f63f3 100644 --- a/cinder/volume/drivers/ibm/storwize_svc/__init__.py +++ b/cinder/volume/drivers/ibm/storwize_svc/__init__.py @@ -38,14 +38,14 @@ import math import time from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import context from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers.ibm.storwize_svc import helpers as storwize_helpers from cinder.volume.drivers.ibm.storwize_svc import replication as storwize_rep diff --git a/cinder/volume/drivers/ibm/storwize_svc/helpers.py b/cinder/volume/drivers/ibm/storwize_svc/helpers.py index 23248a5099f..872ddc83928 100644 --- a/cinder/volume/drivers/ibm/storwize_svc/helpers.py +++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py @@ -19,15 +19,15 @@ import re import unicodedata from eventlet import greenthread +from oslo.utils import excutils +from oslo.utils import strutils import six from cinder import context from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import strutils from cinder.volume.drivers.ibm.storwize_svc import ssh as storwize_ssh from cinder.volume import qos_specs from cinder.volume import utils diff --git a/cinder/volume/drivers/ibm/xiv_ds8k.py b/cinder/volume/drivers/ibm/xiv_ds8k.py index 0dbfdf0394d..9a32b92bd5b 100644 --- a/cinder/volume/drivers/ibm/xiv_ds8k.py +++ b/cinder/volume/drivers/ibm/xiv_ds8k.py @@ -23,9 +23,9 @@ Unified Volume driver for IBM XIV and DS8K Storage Systems. """ from oslo.config import cfg +from oslo.utils import importutils from cinder import exception -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.volume.drivers.san import san diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py index a51b1e7323e..a4035f81bcb 100644 --- a/cinder/volume/drivers/lvm.py +++ b/cinder/volume/drivers/lvm.py @@ -23,6 +23,7 @@ import os import socket from oslo.config import cfg +from oslo.utils import units from cinder.brick import exception as brick_exception from cinder.brick.local_dev import lvm as lvm @@ -32,7 +33,6 @@ from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume import driver from cinder.volume import utils as volutils diff --git a/cinder/volume/drivers/netapp/common.py b/cinder/volume/drivers/netapp/common.py index e3f9e8c1442..d6acd0640d0 100644 --- a/cinder/volume/drivers/netapp/common.py +++ b/cinder/volume/drivers/netapp/common.py @@ -18,10 +18,10 @@ Unified driver for NetApp storage systems. Supports call to multiple storage systems of different families and protocols. """ +from oslo.utils import importutils from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.volume import driver from cinder.volume.drivers.netapp.options import netapp_proxy_opts diff --git a/cinder/volume/drivers/netapp/eseries/iscsi.py b/cinder/volume/drivers/netapp/eseries/iscsi.py index 1ef84cc3586..b80384a94f9 100644 --- a/cinder/volume/drivers/netapp/eseries/iscsi.py +++ b/cinder/volume/drivers/netapp/eseries/iscsi.py @@ -21,13 +21,13 @@ import time import uuid from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units import six from cinder import exception from cinder.i18n import _, _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import utils as cinder_utils from cinder.volume import driver from cinder.volume.drivers.netapp.eseries import client diff --git a/cinder/volume/drivers/netapp/iscsi.py b/cinder/volume/drivers/netapp/iscsi.py index b479a30e6cf..dccac08ca27 100644 --- a/cinder/volume/drivers/netapp/iscsi.py +++ b/cinder/volume/drivers/netapp/iscsi.py @@ -26,14 +26,14 @@ import sys import time import uuid +from oslo.utils import excutils +from oslo.utils import timeutils +from oslo.utils import units import six from cinder import exception from cinder.i18n import _, _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import utils from cinder.volume import driver from cinder.volume.drivers.netapp.api import NaApiError diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py index 35b8db94f4d..288a270059e 100644 --- a/cinder/volume/drivers/netapp/nfs.py +++ b/cinder/volume/drivers/netapp/nfs.py @@ -23,16 +23,16 @@ from threading import Timer import time import uuid +from oslo.utils import excutils +from oslo.utils import units import six import six.moves.urllib.parse as urlparse from cinder import exception from cinder.i18n import _, _LE, _LI, _LW from cinder.image import image_utils -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers.netapp.api import NaApiError from cinder.volume.drivers.netapp.api import NaElement diff --git a/cinder/volume/drivers/netapp/ssc_utils.py b/cinder/volume/drivers/netapp/ssc_utils.py index a318b10768e..2c22ef6cfa5 100644 --- a/cinder/volume/drivers/netapp/ssc_utils.py +++ b/cinder/volume/drivers/netapp/ssc_utils.py @@ -20,12 +20,12 @@ Storage service catalog utility functions and classes for NetApp systems. import copy from threading import Timer +from oslo.utils import timeutils import six from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils from cinder import utils from cinder.volume import driver from cinder.volume.drivers.netapp import api diff --git a/cinder/volume/drivers/netapp/utils.py b/cinder/volume/drivers/netapp/utils.py index 85d24ca00e6..a4fd34afd98 100644 --- a/cinder/volume/drivers/netapp/utils.py +++ b/cinder/volume/drivers/netapp/utils.py @@ -28,6 +28,7 @@ import platform import socket import uuid +from oslo.utils import timeutils import six from cinder import context @@ -35,7 +36,6 @@ from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils -from cinder.openstack.common import timeutils from cinder import utils from cinder import version from cinder.volume.drivers.netapp.api import NaApiError diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py index d3eee00e644..84e6976aa74 100644 --- a/cinder/volume/drivers/nexenta/nfs.py +++ b/cinder/volume/drivers/nexenta/nfs.py @@ -25,12 +25,13 @@ import hashlib import os import re +from oslo.utils import units + from cinder import context from cinder import db from cinder import exception from cinder.i18n import _, _LE, _LI, _LW from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume.drivers import nexenta from cinder.volume.drivers.nexenta import jsonrpc from cinder.volume.drivers.nexenta import options diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py index 55f040970fd..a7c3f12c1c4 100644 --- a/cinder/volume/drivers/nexenta/utils.py +++ b/cinder/volume/drivers/nexenta/utils.py @@ -23,10 +23,10 @@ import re +from oslo.utils import units import six.moves.urllib.parse as urlparse from cinder.i18n import _ -from cinder.openstack.common import units def str2size(s, scale=1024): diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py index d2aef63cc20..e671e979851 100644 --- a/cinder/volume/drivers/nfs.py +++ b/cinder/volume/drivers/nfs.py @@ -17,6 +17,7 @@ import errno import os from oslo.config import cfg +from oslo.utils import units from cinder.brick.remotefs import remotefs as remotefs_brick from cinder import exception @@ -24,7 +25,6 @@ from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers import remotefs diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py index 8b497ad8387..76a74aad662 100644 --- a/cinder/volume/drivers/nimble.py +++ b/cinder/volume/drivers/nimble.py @@ -25,12 +25,12 @@ import string import urllib2 from oslo.config import cfg +from oslo.utils import units from suds import client from cinder import exception from cinder.i18n import _, _LE, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume.drivers.san.san import SanISCSIDriver diff --git a/cinder/volume/drivers/prophetstor/dplcommon.py b/cinder/volume/drivers/prophetstor/dplcommon.py index 5b7995e25b3..669c1ba16cd 100644 --- a/cinder/volume/drivers/prophetstor/dplcommon.py +++ b/cinder/volume/drivers/prophetstor/dplcommon.py @@ -24,13 +24,13 @@ import json import random import time +from oslo.utils import units import six from cinder import exception from cinder.i18n import _, _LE, _LI from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import units from cinder.volume import driver from cinder.volume.drivers.prophetstor import options from cinder.volume.drivers.san import san diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py index 683634b2ecc..91334975e13 100644 --- a/cinder/volume/drivers/pure.py +++ b/cinder/volume/drivers/pure.py @@ -25,13 +25,13 @@ import urllib2 import uuid from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import exception from cinder.i18n import _LE, _LI, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers.san import san diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py index be23b7ebd76..2ccbb0e3525 100644 --- a/cinder/volume/drivers/rbd.py +++ b/cinder/volume/drivers/rbd.py @@ -22,6 +22,8 @@ import tempfile import urllib from oslo.config import cfg +from oslo.utils import encodeutils +from oslo.utils import units import six from cinder import exception @@ -29,8 +31,6 @@ from cinder.i18n import _, _LE, _LI, _LW from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging -from cinder.openstack.common import strutils -from cinder.openstack.common import units from cinder.volume import driver try: @@ -89,9 +89,9 @@ class RBDImageMetadata(object): """RBD image metadata to be used with RBDImageIOWrapper.""" def __init__(self, image, pool, user, conf): self.image = image - self.pool = strutils.safe_encode(pool) - self.user = strutils.safe_encode(user) - self.conf = strutils.safe_encode(conf) + self.pool = encodeutils.safe_encode(pool) + self.user = encodeutils.safe_encode(user) + self.conf = encodeutils.safe_encode(conf) class RBDImageIOWrapper(io.RawIOBase): @@ -206,10 +206,11 @@ class RBDVolumeProxy(object): read_only=False): client, ioctx = driver._connect_to_rados(pool) if snapshot is not None: - snapshot = strutils.safe_encode(snapshot) + snapshot = encodeutils.safe_encode(snapshot) try: - self.volume = driver.rbd.Image(ioctx, strutils.safe_encode(name), + self.volume = driver.rbd.Image(ioctx, + encodeutils.safe_encode(name), snapshot=snapshot, read_only=read_only) except driver.rbd.Error: @@ -264,7 +265,7 @@ class RBDDriver(driver.VolumeDriver): for attr in ['rbd_user', 'rbd_ceph_conf', 'rbd_pool']: val = getattr(self.configuration, attr) if val is not None: - setattr(self.configuration, attr, strutils.safe_encode(val)) + setattr(self.configuration, attr, encodeutils.safe_encode(val)) def check_for_setup_error(self): """Returns an error if prerequisites aren't met.""" @@ -294,7 +295,7 @@ class RBDDriver(driver.VolumeDriver): client = self.rados.Rados(rados_id=self.configuration.rbd_user, conffile=self.configuration.rbd_ceph_conf) if pool is not None: - pool = strutils.safe_encode(pool) + pool = encodeutils.safe_encode(pool) else: pool = self.configuration.rbd_pool @@ -414,8 +415,8 @@ class RBDDriver(driver.VolumeDriver): and that clone has rbd_max_clone_depth clones behind it, the source volume will be flattened. """ - src_name = strutils.safe_encode(src_vref['name']) - dest_name = strutils.safe_encode(volume['name']) + src_name = encodeutils.safe_encode(src_vref['name']) + dest_name = encodeutils.safe_encode(volume['name']) flatten_parent = False # Do full copy if requested @@ -501,7 +502,7 @@ class RBDDriver(driver.VolumeDriver): with RADOSClient(self) as client: self.rbd.RBD().create(client.ioctx, - strutils.safe_encode(volume['name']), + encodeutils.safe_encode(volume['name']), size, order, old_format=old_format, @@ -520,10 +521,10 @@ class RBDDriver(driver.VolumeDriver): with RADOSClient(self, src_pool) as src_client: with RADOSClient(self) as dest_client: self.rbd.RBD().clone(src_client.ioctx, - strutils.safe_encode(src_image), - strutils.safe_encode(src_snap), + encodeutils.safe_encode(src_image), + encodeutils.safe_encode(src_snap), dest_client.ioctx, - strutils.safe_encode(volume['name']), + encodeutils.safe_encode(volume['name']), features=self.rbd.RBD_FEATURE_LAYERING) def _resize(self, volume, **kwargs): @@ -610,7 +611,7 @@ class RBDDriver(driver.VolumeDriver): """Deletes a logical volume.""" # NOTE(dosaboy): this was broken by commit cbe1d5f. Ensure names are # utf-8 otherwise librbd will barf. - volume_name = strutils.safe_encode(volume['name']) + volume_name = encodeutils.safe_encode(volume['name']) with RADOSClient(self) as client: try: rbd_image = self.rbd.Image(client.ioctx, volume_name) @@ -676,7 +677,7 @@ class RBDDriver(driver.VolumeDriver): def create_snapshot(self, snapshot): """Creates an rbd snapshot.""" with RBDVolumeProxy(self, snapshot['volume_name']) as volume: - snap = strutils.safe_encode(snapshot['name']) + snap = encodeutils.safe_encode(snapshot['name']) volume.create_snap(snap) if self._supports_layering(): volume.protect_snap(snap) @@ -685,8 +686,8 @@ class RBDDriver(driver.VolumeDriver): """Deletes an rbd snapshot.""" # NOTE(dosaboy): this was broken by commit cbe1d5f. Ensure names are # utf-8 otherwise librbd will barf. - volume_name = strutils.safe_encode(snapshot['volume_name']) - snap_name = strutils.safe_encode(snapshot['name']) + volume_name = encodeutils.safe_encode(snapshot['volume_name']) + snap_name = encodeutils.safe_encode(snapshot['name']) with RBDVolumeProxy(self, volume_name) as volume: if self._supports_layering(): try: @@ -890,8 +891,9 @@ class RBDDriver(driver.VolumeDriver): # Raise an exception if we didn't find a suitable rbd image. with RADOSClient(self) as client: rbd_name = existing_ref['source-name'] - self.rbd.RBD().rename(client.ioctx, strutils.safe_encode(rbd_name), - strutils.safe_encode(volume['name'])) + self.rbd.RBD().rename(client.ioctx, + encodeutils.safe_encode(rbd_name), + encodeutils.safe_encode(volume['name'])) def manage_existing_get_size(self, volume, existing_ref): """Return size of an existing image for manage_existing. @@ -909,7 +911,7 @@ class RBDDriver(driver.VolumeDriver): raise exception.ManageExistingInvalidReference( existing_ref=existing_ref, reason=reason) - rbd_name = strutils.safe_encode(existing_ref['source-name']) + rbd_name = encodeutils.safe_encode(existing_ref['source-name']) with RADOSClient(self) as client: # Raise an exception if we didn't find a suitable rbd image. diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index 4c1850d8ac1..6cc809b9580 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -21,13 +21,13 @@ import re import tempfile from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _, _LE, _LI, _LW from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils -from cinder.openstack.common import units from cinder.volume import driver LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py index b780842b7da..ed15db9abf2 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_common.py +++ b/cinder/volume/drivers/san/hp/hp_3par_common.py @@ -42,24 +42,24 @@ import pprint import re import uuid +from oslo.utils import importutils import six -from cinder.openstack.common import importutils hp3parclient = importutils.try_import("hp3parclient") if hp3parclient: from hp3parclient import client from hp3parclient import exceptions as hpexceptions from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import context from cinder import exception from cinder import flow_utils from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import loopingcall -from cinder.openstack.common import units from cinder.volume import qos_specs from cinder.volume import utils as volume_utils from cinder.volume import volume_types diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py index 420362a0eab..b334002495d 100644 --- a/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py +++ b/cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py @@ -21,12 +21,12 @@ operations on the SAN. """ from lxml import etree +from oslo.utils import units from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder.volume.drivers.san.san import SanISCSIDriver diff --git a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py index fb39aec99b0..a916d405406 100644 --- a/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py +++ b/cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py @@ -16,12 +16,12 @@ """HP LeftHand SAN ISCSI REST Proxy.""" from oslo.config import cfg +from oslo.utils import units from cinder import context from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume.driver import ISCSIDriver from cinder.volume import utils from cinder.volume import volume_types diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py index 81f66df30de..5637203d953 100644 --- a/cinder/volume/drivers/san/san.py +++ b/cinder/volume/drivers/san/san.py @@ -23,10 +23,10 @@ import random from eventlet import greenthread from oslo.config import cfg +from oslo.utils import excutils from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import ssh_utils diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py index c272dbd1100..282ac3a1b71 100644 --- a/cinder/volume/drivers/scality.py +++ b/cinder/volume/drivers/scality.py @@ -22,13 +22,13 @@ import os import urllib2 from oslo.config import cfg +from oslo.utils import units import six.moves.urllib.parse as urlparse from cinder import exception from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume import driver diff --git a/cinder/volume/drivers/sheepdog.py b/cinder/volume/drivers/sheepdog.py index 85841c78953..0ee092efa92 100644 --- a/cinder/volume/drivers/sheepdog.py +++ b/cinder/volume/drivers/sheepdog.py @@ -23,13 +23,13 @@ import re import tempfile from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _, _LE from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import units from cinder.volume import driver diff --git a/cinder/volume/drivers/smbfs.py b/cinder/volume/drivers/smbfs.py index d824e8127ee..a6863b35420 100644 --- a/cinder/volume/drivers/smbfs.py +++ b/cinder/volume/drivers/smbfs.py @@ -17,6 +17,7 @@ import os import re from oslo.config import cfg +from oslo.utils import units from cinder.brick.remotefs import remotefs from cinder import exception @@ -24,7 +25,6 @@ from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils as putils -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers import remotefs as remotefs_drv diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py index ff6cda16c5f..2684d27089c 100644 --- a/cinder/volume/drivers/solidfire.py +++ b/cinder/volume/drivers/solidfire.py @@ -20,6 +20,8 @@ import string import time from oslo.config import cfg +from oslo.utils import timeutils +from oslo.utils import units import requests from six import wraps @@ -27,8 +29,6 @@ from cinder import context from cinder import exception from cinder.i18n import _, _LE, _LW from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder.volume.drivers.san.san import SanISCSIDriver from cinder.volume import qos_specs from cinder.volume import volume_types diff --git a/cinder/volume/drivers/vmware/datastore.py b/cinder/volume/drivers/vmware/datastore.py index 9aab5af1726..f686596bd23 100644 --- a/cinder/volume/drivers/vmware/datastore.py +++ b/cinder/volume/drivers/vmware/datastore.py @@ -17,8 +17,9 @@ Classes and utility methods for datastore selection. """ +from oslo.utils import excutils + from cinder.i18n import _LE, _LW -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.volume.drivers.vmware import error_util from cinder.volume.drivers.vmware import vim_util diff --git a/cinder/volume/drivers/vmware/vmdk.py b/cinder/volume/drivers/vmware/vmdk.py index 50f92080cb5..28cfdf62df4 100644 --- a/cinder/volume/drivers/vmware/vmdk.py +++ b/cinder/volume/drivers/vmware/vmdk.py @@ -28,13 +28,13 @@ import os import tempfile from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import units from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.openstack.common import uuidutils from cinder.volume import driver from cinder.volume.drivers.vmware import api diff --git a/cinder/volume/drivers/vmware/volumeops.py b/cinder/volume/drivers/vmware/volumeops.py index bae6fb6e312..92bdf422eeb 100644 --- a/cinder/volume/drivers/vmware/volumeops.py +++ b/cinder/volume/drivers/vmware/volumeops.py @@ -19,9 +19,10 @@ Implements operations on volumes residing on VMware datastores. import urllib +from oslo.utils import units + from cinder.i18n import _, _LE, _LI from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder.volume.drivers.vmware import error_util from cinder.volume.drivers.vmware import vim_util diff --git a/cinder/volume/drivers/windows/smbfs.py b/cinder/volume/drivers/windows/smbfs.py index c7e26eff447..76fc2410a83 100644 --- a/cinder/volume/drivers/windows/smbfs.py +++ b/cinder/volume/drivers/windows/smbfs.py @@ -19,13 +19,13 @@ import re import sys from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _ from cinder.image import image_utils from cinder.openstack.common import fileutils from cinder.openstack.common import log as logging -from cinder.openstack.common import units from cinder import utils from cinder.volume.drivers import smbfs from cinder.volume.drivers.windows import remotefs diff --git a/cinder/volume/drivers/zfssa/zfssaiscsi.py b/cinder/volume/drivers/zfssa/zfssaiscsi.py index f2c781fbe00..1842c245f77 100644 --- a/cinder/volume/drivers/zfssa/zfssaiscsi.py +++ b/cinder/volume/drivers/zfssa/zfssaiscsi.py @@ -17,11 +17,11 @@ ZFS Storage Appliance Cinder Volume Driver import base64 from oslo.config import cfg +from oslo.utils import units from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log -from cinder.openstack.common import units from cinder.volume import driver from cinder.volume.drivers.san import san from cinder.volume.drivers.zfssa import zfssarest diff --git a/cinder/volume/flows/api/create_volume.py b/cinder/volume/flows/api/create_volume.py index f915bdc1b42..5e054001c8f 100644 --- a/cinder/volume/flows/api/create_volume.py +++ b/cinder/volume/flows/api/create_volume.py @@ -12,6 +12,8 @@ from oslo.config import cfg +from oslo.utils import timeutils +from oslo.utils import units import taskflow.engines from taskflow.patterns import linear_flow from taskflow.utils import misc @@ -20,8 +22,6 @@ from cinder import exception from cinder import flow_utils from cinder.i18n import _, _LE from cinder.openstack.common import log as logging -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import policy from cinder import quota from cinder import utils diff --git a/cinder/volume/flows/manager/create_volume.py b/cinder/volume/flows/manager/create_volume.py index f26892a5958..fd206816f85 100644 --- a/cinder/volume/flows/manager/create_volume.py +++ b/cinder/volume/flows/manager/create_volume.py @@ -13,6 +13,7 @@ import traceback from oslo.config import cfg +from oslo.utils import timeutils import taskflow.engines from taskflow.patterns import linear_flow from taskflow.utils import misc @@ -23,7 +24,6 @@ from cinder.i18n import _, _LE, _LI from cinder.image import glance from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import timeutils from cinder import utils from cinder.volume.flows import common from cinder.volume import utils as volume_utils diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index eaa8bf4250f..b5a68b5b7ff 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -42,6 +42,9 @@ import time from oslo.config import cfg from oslo import messaging from oslo.serialization import jsonutils +from oslo.utils import excutils +from oslo.utils import importutils +from oslo.utils import timeutils from osprofiler import profiler from cinder import compute @@ -51,11 +54,8 @@ from cinder import flow_utils from cinder.i18n import _, _LE, _LI, _LW from cinder.image import glance from cinder import manager -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.openstack.common import periodic_task -from cinder.openstack.common import timeutils from cinder.openstack.common import uuidutils from cinder import quota from cinder import utils diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py index 24ccf6141dc..61ae354ade2 100644 --- a/cinder/volume/utils.py +++ b/cinder/volume/utils.py @@ -19,15 +19,15 @@ import math from Crypto.Random import random from oslo.config import cfg +from oslo.utils import strutils +from oslo.utils import timeutils +from oslo.utils import units from cinder.brick.local_dev import lvm as brick_lvm from cinder import exception from cinder.i18n import _ from cinder.openstack.common import log as logging from cinder.openstack.common import processutils -from cinder.openstack.common import strutils -from cinder.openstack.common import timeutils -from cinder.openstack.common import units from cinder import rpc from cinder import utils diff --git a/cinder/wsgi.py b/cinder/wsgi.py index 7d09a2b3fc1..b575161826f 100644 --- a/cinder/wsgi.py +++ b/cinder/wsgi.py @@ -30,6 +30,8 @@ import eventlet import eventlet.wsgi import greenlet from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import netutils from paste import deploy import routes.middleware import webob.dec @@ -37,9 +39,7 @@ import webob.exc from cinder import exception from cinder.i18n import _, _LE, _LI -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging -from cinder.openstack.common import network_utils from cinder import utils @@ -208,11 +208,11 @@ class Server(object): # NOTE(praneshp): Call set_tcp_keepalive in oslo to set # tcp keepalive parameters. Sockets can hang around forever # without keepalive - network_utils.set_tcp_keepalive(dup_socket, - CONF.tcp_keepalive, - CONF.tcp_keepidle, - CONF.tcp_keepalive_count, - CONF.tcp_keepalive_interval) + netutils.set_tcp_keepalive(dup_socket, + CONF.tcp_keepalive, + CONF.tcp_keepidle, + CONF.tcp_keepalive_count, + CONF.tcp_keepalive_interval) if self._use_ssl: try: diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py index 8c64cb1784b..7e00e0823f4 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py +++ b/cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py @@ -18,11 +18,11 @@ from oslo.config import cfg +from oslo.utils import excutils import paramiko from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder import utils from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py index d952de64969..e54a50cf72c 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py +++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py @@ -25,10 +25,10 @@ import random import re from eventlet import greenthread +from oslo.utils import excutils from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import ssh_utils diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py index 7e624b267a9..96b1629952f 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py +++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py @@ -31,11 +31,11 @@ add_connection and delete_connection interfaces. from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py index a72bc9f9f95..659157a8bba 100644 --- a/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py +++ b/cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py @@ -18,11 +18,11 @@ import random from eventlet import greenthread +from oslo.utils import excutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import ssh_utils diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py index 7980708fdfb..8f010dad7d2 100644 --- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py +++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py @@ -22,11 +22,11 @@ import random import re from eventlet import greenthread +from oslo.utils import excutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common import processutils from cinder import ssh_utils diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py index 73c066549e0..15fe0d837bd 100644 --- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py +++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py @@ -28,12 +28,12 @@ add_connection and delete_connection interfaces. """ from oslo.config import cfg +from oslo.utils import excutils +from oslo.utils import importutils import six from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import excutils -from cinder.openstack.common import importutils from cinder.openstack.common import lockutils from cinder.openstack.common import log as logging from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py index dd338d3ece2..1cbee7cf89a 100644 --- a/cinder/zonemanager/fc_san_lookup_service.py +++ b/cinder/zonemanager/fc_san_lookup_service.py @@ -23,9 +23,10 @@ defined in this class. """ +from oslo.utils import importutils + from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.volume import configuration as config from cinder.zonemanager import fc_common diff --git a/cinder/zonemanager/fc_zone_manager.py b/cinder/zonemanager/fc_zone_manager.py index e224972efd9..42868da6edf 100644 --- a/cinder/zonemanager/fc_zone_manager.py +++ b/cinder/zonemanager/fc_zone_manager.py @@ -32,10 +32,10 @@ detach operation. """ from oslo.config import cfg +from oslo.utils import importutils from cinder import exception from cinder.i18n import _ -from cinder.openstack.common import importutils from cinder.openstack.common import log as logging from cinder.volume import configuration as config from cinder.zonemanager import fc_common diff --git a/openstack-common.conf b/openstack-common.conf index 663a642e7ec..6152d233ac1 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -7,7 +7,6 @@ module=excutils module=fileutils module=gettextutils module=imageutils -module=importutils module=install_venv_common module=jsonutils module=local @@ -16,7 +15,6 @@ module=log module=log_handler module=loopingcall module=middleware -module=network_utils module=periodic_task module=policy module=processutils @@ -27,7 +25,6 @@ module=scheduler.weights module=service module=strutils module=timeutils -module=units module=uuidutils module=versionutils diff --git a/requirements.txt b/requirements.txt index 9507c57a484..8d5e8676acf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ oslo.db>=1.0.0 # Apache-2.0 oslo.messaging>=1.4.0 oslo.rootwrap>=1.3.0 oslo.serialization>=1.0.0 # Apache-2.0 +oslo.utils>=1.0.0 # Apache-2.0 osprofiler>=0.3.0 # Apache-2.0 paramiko>=1.13.0 Paste