openstack
/
cinder
Code Issues Proposed changes

Merge "Unpin flake8-logging-format" into stable/xena

This commit is contained in:
Zuul 2022-08-10 16:08:44 +00:00 committed by Gerrit Code Review
parent b186153709 14f6b7ac68
commit b2caec7696
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/volume/drivers/netapp/dataontap/block_cmode.py
View File

@ -677,10 +677,10 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary,
try:
dest_client.destroy_lun(lun_path)
except Exception:
LOG.warn('Error cleaning up LUN %s in destination volume. '
'Verify if destination volume still exists in pool '
'%s and delete it manually to avoid unused '
'resources.', lun_path, dest_pool)
LOG.warning('Error cleaning up LUN %s in destination volume. '
'Verify if destination volume still exists in '
'pool %s and delete it manually to avoid unused '
'resources.', lun_path, dest_pool)
def _copy_lun(self, volume, src_ontap_volume, src_vserver,
dest_ontap_volume, dest_vserver, dest_lun_name=None,
@ -803,7 +803,7 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary,
'performing operations with this volume. Check the '
'migration status on the storage side and set '
'volume status manually if migration succeeded.'))
LOG.warn(error_msg, volume.id)
LOG.warning(error_msg, volume.id)
updates['status'] = fields.VolumeStatus.MAINTENANCE
except na_utils.NetAppDriverException as e:
error_msg = (_('Failed to migrate volume %(vol)s from pool '

8
cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
View File

@ -1085,10 +1085,10 @@ class NetAppCmodeNfsDriver(nfs_base.NetAppNfsDriver,
try:
dest_client.delete_file(file_path)
except Exception:
LOG.warn('Error cleaning up file %s in destination volume. '
'Verify if destination volume still exists in pool '
'%s and delete it manually to avoid unused '
'resources.', file_path, dest_pool)
LOG.warning('Error cleaning up file %s in destination volume. '
'Verify if destination volume still exists in '
'pool %s and delete it manually to avoid unused '
'resources.', file_path, dest_pool)
def _copy_file(self, volume, src_ontap_volume, src_vserver,
dest_ontap_volume, dest_vserver, dest_file_name=None,

2
test-requirements.txt
View File

@ -5,7 +5,7 @@
# Install bounded pep8/pyflakes first, then let flake8 install
hacking>=4.0.0,<4.1.0 # Apache-2.0
flake8-import-order # LGPLv3
flake8-logging-format==0.6.0 # Apache-2.0
flake8-logging-format>=0.6.0 # Apache-2.0
stestr>=3.1.0 # Apache-2.0
coverage>=5.5 # Apache-2.0