From 27afe7147681d7d7798de03ffdf710d20217513b Mon Sep 17 00:00:00 2001 From: zhufl Date: Sun, 5 May 2019 17:22:10 +0800 Subject: [PATCH] [Trivial fix]Remove unnecessary slash This is to remove the unncessary slash when the line doesn't exceed the length of 79, to make the code more readable. Change-Id: I3fea5d24692be8b8575379aff7b75a5479f314ef --- cinder/api/v2/router.py | 3 +-- cinder/api/v3/router.py | 3 +-- cinder/volume/drivers/ibm/gpfs.py | 3 +-- cinder/volume/drivers/lvm.py | 3 +-- .../netapp/dataontap/client/client_base.py | 19 +++++++++---------- .../drivers/netapp/dataontap/nfs_base.py | 10 ++++------ .../volume/drivers/prophetstor/dpl_iscsi.py | 7 +++---- cinder/volume/targets/iscsi.py | 6 ++---- cinder/volume/targets/lio.py | 3 +-- 9 files changed, 23 insertions(+), 34 deletions(-) diff --git a/cinder/api/v2/router.py b/cinder/api/v2/router.py index df442f55807..3a5ba81ecb7 100644 --- a/cinder/api/v2/router.py +++ b/cinder/api/v2/router.py @@ -78,8 +78,7 @@ class APIRouter(cinder.api.openstack.APIRouter): action='update_all', conditions={"method": ['PUT']}) - self.resources['volume_metadata'] = \ - volume_metadata.create_resource() + self.resources['volume_metadata'] = volume_metadata.create_resource() volume_metadata_controller = self.resources['volume_metadata'] mapper.resource("volume_metadata", "metadata", diff --git a/cinder/api/v3/router.py b/cinder/api/v3/router.py index 173f877bfd5..8bf3229055a 100644 --- a/cinder/api/v3/router.py +++ b/cinder/api/v3/router.py @@ -139,8 +139,7 @@ class APIRouter(cinder.api.openstack.APIRouter): action='update_all', conditions={"method": ['PUT']}) - self.resources['volume_metadata'] = \ - volume_metadata.create_resource() + self.resources['volume_metadata'] = volume_metadata.create_resource() volume_metadata_controller = self.resources['volume_metadata'] mapper.resource("volume_metadata", "metadata", diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py index 153ad51e12a..b14fe7db6b1 100644 --- a/cinder/volume/drivers/ibm/gpfs.py +++ b/cinder/volume/drivers/ibm/gpfs.py @@ -479,8 +479,7 @@ class GPFSDriver(driver.CloneableImageVD, # Check if GPFS is mounted self._verify_gpfs_path_state(directory) - filesystem, fslevel = \ - self._get_gpfs_fs_release_level(directory) + filesystem, fslevel = self._get_gpfs_fs_release_level(directory) if fslevel < GPFS_CLONE_MIN_RELEASE: msg = (_('The GPFS filesystem %(fs)s is not at the required ' 'release level. Current level is %(cur)s, must be ' diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py index ca26488af12..6e50d91207f 100644 --- a/cinder/volume/drivers/lvm.py +++ b/cinder/volume/drivers/lvm.py @@ -309,8 +309,7 @@ class LVMVolumeDriver(driver.VolumeDriver): vg_list = volutils.get_all_volume_groups( self.configuration.volume_group) - vg_dict = \ - next(vg for vg in vg_list if vg['name'] == self.vg.vg_name) + vg_dict = next(vg for vg in vg_list if vg['name'] == self.vg.vg_name) if vg_dict is None: message = (_("Volume Group %s does not exist") % self.configuration.volume_group) diff --git a/cinder/volume/drivers/netapp/dataontap/client/client_base.py b/cinder/volume/drivers/netapp/dataontap/client/client_base.py index 7fe19604e0d..ddc8bd260c3 100644 --- a/cinder/volume/drivers/netapp/dataontap/client/client_base.py +++ b/cinder/volume/drivers/netapp/dataontap/client/client_base.py @@ -194,16 +194,15 @@ class Client(object): try: result = self.connection.invoke_successfully(lun_geo, True) geometry['size'] = result.get_child_content("size") - geometry['bytes_per_sector'] =\ - result.get_child_content("bytes-per-sector") - geometry['sectors_per_track'] =\ - result.get_child_content("sectors-per-track") - geometry['tracks_per_cylinder'] =\ - result.get_child_content("tracks-per-cylinder") - geometry['cylinders'] =\ - result.get_child_content("cylinders") - geometry['max_resize'] =\ - result.get_child_content("max-resize-size") + geometry['bytes_per_sector'] = result.get_child_content( + "bytes-per-sector") + geometry['sectors_per_track'] = result.get_child_content( + "sectors-per-track") + geometry['tracks_per_cylinder'] = result.get_child_content( + "tracks-per-cylinder") + geometry['cylinders'] = result.get_child_content("cylinders") + geometry['max_resize'] = result.get_child_content( + "max-resize-size") except Exception as e: LOG.error("LUN %(path)s geometry failed. Message - %(msg)s", {'path': path, 'msg': six.text_type(e)}) diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_base.py b/cinder/volume/drivers/netapp/dataontap/nfs_base.py index e3c20814419..df768d1b95f 100644 --- a/cinder/volume/drivers/netapp/dataontap/nfs_base.py +++ b/cinder/volume/drivers/netapp/dataontap/nfs_base.py @@ -428,14 +428,12 @@ class NetAppNfsDriver(driver.ManageableVD, """Clean the image cache files in cache of space crunch.""" try: LOG.debug('Image cache cleaning in progress.') - thres_size_perc_start =\ - self.configuration.thres_avl_size_perc_start - thres_size_perc_stop = \ - self.configuration.thres_avl_size_perc_stop + thres_size_perc_start = ( + self.configuration.thres_avl_size_perc_start) + thres_size_perc_stop = self.configuration.thres_avl_size_perc_stop for share in getattr(self, '_mounted_shares', []): try: - total_size, total_avl = \ - self._get_capacity_info(share) + total_size, total_avl = self._get_capacity_info(share) avl_percent = int((float(total_avl) / total_size) * 100) if avl_percent <= thres_size_perc_start: LOG.info('Cleaning cache for share %s.', share) diff --git a/cinder/volume/drivers/prophetstor/dpl_iscsi.py b/cinder/volume/drivers/prophetstor/dpl_iscsi.py index 60df27458dc..f922e5dca57 100644 --- a/cinder/volume/drivers/prophetstor/dpl_iscsi.py +++ b/cinder/volume/drivers/prophetstor/dpl_iscsi.py @@ -97,10 +97,9 @@ class DPLISCSIDriver(dplcommon.DPLCOMMONDriver, break if properties['target_portal'] != '': - properties['target_lun'] = \ - int(tgInfo['logical_unit_number']) - properties['target_iqn'] = \ - tgInfo['target_identifier'] + properties['target_lun'] = int( + tgInfo['logical_unit_number']) + properties['target_iqn'] = tgInfo['target_identifier'] break if not (ret == 0 or properties['target_portal']): diff --git a/cinder/volume/targets/iscsi.py b/cinder/volume/targets/iscsi.py index 15a228d92eb..67311aadbfa 100644 --- a/cinder/volume/targets/iscsi.py +++ b/cinder/volume/targets/iscsi.py @@ -35,10 +35,8 @@ class ISCSITarget(driver.Target): def __init__(self, *args, **kwargs): super(ISCSITarget, self).__init__(*args, **kwargs) - self.iscsi_target_prefix = \ - self.configuration.safe_get('target_prefix') - self.iscsi_protocol = \ - self.configuration.safe_get('target_protocol') + self.iscsi_target_prefix = self.configuration.safe_get('target_prefix') + self.iscsi_protocol = self.configuration.safe_get('target_protocol') self.protocol = 'iSCSI' self.volumes_dir = self.configuration.safe_get('volumes_dir') diff --git a/cinder/volume/targets/lio.py b/cinder/volume/targets/lio.py index 7b699c233db..dfdc0c805fd 100644 --- a/cinder/volume/targets/lio.py +++ b/cinder/volume/targets/lio.py @@ -27,8 +27,7 @@ class LioAdm(iscsi.ISCSITarget): super(LioAdm, self).__init__(*args, **kwargs) # FIXME(jdg): modify executor to use the cinder-rtstool - self.iscsi_target_prefix =\ - self.configuration.safe_get('target_prefix') + self.iscsi_target_prefix = self.configuration.safe_get('target_prefix') self._verify_rtstool()