[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
This commit is contained in:
parent
d8dbc4c0aa
commit
27afe71476
|
@ -78,8 +78,7 @@ class APIRouter(cinder.api.openstack.APIRouter):
|
||||||
action='update_all',
|
action='update_all',
|
||||||
conditions={"method": ['PUT']})
|
conditions={"method": ['PUT']})
|
||||||
|
|
||||||
self.resources['volume_metadata'] = \
|
self.resources['volume_metadata'] = volume_metadata.create_resource()
|
||||||
volume_metadata.create_resource()
|
|
||||||
volume_metadata_controller = self.resources['volume_metadata']
|
volume_metadata_controller = self.resources['volume_metadata']
|
||||||
|
|
||||||
mapper.resource("volume_metadata", "metadata",
|
mapper.resource("volume_metadata", "metadata",
|
||||||
|
|
|
@ -139,8 +139,7 @@ class APIRouter(cinder.api.openstack.APIRouter):
|
||||||
action='update_all',
|
action='update_all',
|
||||||
conditions={"method": ['PUT']})
|
conditions={"method": ['PUT']})
|
||||||
|
|
||||||
self.resources['volume_metadata'] = \
|
self.resources['volume_metadata'] = volume_metadata.create_resource()
|
||||||
volume_metadata.create_resource()
|
|
||||||
volume_metadata_controller = self.resources['volume_metadata']
|
volume_metadata_controller = self.resources['volume_metadata']
|
||||||
|
|
||||||
mapper.resource("volume_metadata", "metadata",
|
mapper.resource("volume_metadata", "metadata",
|
||||||
|
|
|
@ -479,8 +479,7 @@ class GPFSDriver(driver.CloneableImageVD,
|
||||||
# Check if GPFS is mounted
|
# Check if GPFS is mounted
|
||||||
self._verify_gpfs_path_state(directory)
|
self._verify_gpfs_path_state(directory)
|
||||||
|
|
||||||
filesystem, fslevel = \
|
filesystem, fslevel = self._get_gpfs_fs_release_level(directory)
|
||||||
self._get_gpfs_fs_release_level(directory)
|
|
||||||
if fslevel < GPFS_CLONE_MIN_RELEASE:
|
if fslevel < GPFS_CLONE_MIN_RELEASE:
|
||||||
msg = (_('The GPFS filesystem %(fs)s is not at the required '
|
msg = (_('The GPFS filesystem %(fs)s is not at the required '
|
||||||
'release level. Current level is %(cur)s, must be '
|
'release level. Current level is %(cur)s, must be '
|
||||||
|
|
|
@ -309,8 +309,7 @@ class LVMVolumeDriver(driver.VolumeDriver):
|
||||||
|
|
||||||
vg_list = volutils.get_all_volume_groups(
|
vg_list = volutils.get_all_volume_groups(
|
||||||
self.configuration.volume_group)
|
self.configuration.volume_group)
|
||||||
vg_dict = \
|
vg_dict = next(vg for vg in vg_list if vg['name'] == self.vg.vg_name)
|
||||||
next(vg for vg in vg_list if vg['name'] == self.vg.vg_name)
|
|
||||||
if vg_dict is None:
|
if vg_dict is None:
|
||||||
message = (_("Volume Group %s does not exist") %
|
message = (_("Volume Group %s does not exist") %
|
||||||
self.configuration.volume_group)
|
self.configuration.volume_group)
|
||||||
|
|
|
@ -194,16 +194,15 @@ class Client(object):
|
||||||
try:
|
try:
|
||||||
result = self.connection.invoke_successfully(lun_geo, True)
|
result = self.connection.invoke_successfully(lun_geo, True)
|
||||||
geometry['size'] = result.get_child_content("size")
|
geometry['size'] = result.get_child_content("size")
|
||||||
geometry['bytes_per_sector'] =\
|
geometry['bytes_per_sector'] = result.get_child_content(
|
||||||
result.get_child_content("bytes-per-sector")
|
"bytes-per-sector")
|
||||||
geometry['sectors_per_track'] =\
|
geometry['sectors_per_track'] = result.get_child_content(
|
||||||
result.get_child_content("sectors-per-track")
|
"sectors-per-track")
|
||||||
geometry['tracks_per_cylinder'] =\
|
geometry['tracks_per_cylinder'] = result.get_child_content(
|
||||||
result.get_child_content("tracks-per-cylinder")
|
"tracks-per-cylinder")
|
||||||
geometry['cylinders'] =\
|
geometry['cylinders'] = result.get_child_content("cylinders")
|
||||||
result.get_child_content("cylinders")
|
geometry['max_resize'] = result.get_child_content(
|
||||||
geometry['max_resize'] =\
|
"max-resize-size")
|
||||||
result.get_child_content("max-resize-size")
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.error("LUN %(path)s geometry failed. Message - %(msg)s",
|
LOG.error("LUN %(path)s geometry failed. Message - %(msg)s",
|
||||||
{'path': path, 'msg': six.text_type(e)})
|
{'path': path, 'msg': six.text_type(e)})
|
||||||
|
|
|
@ -428,14 +428,12 @@ class NetAppNfsDriver(driver.ManageableVD,
|
||||||
"""Clean the image cache files in cache of space crunch."""
|
"""Clean the image cache files in cache of space crunch."""
|
||||||
try:
|
try:
|
||||||
LOG.debug('Image cache cleaning in progress.')
|
LOG.debug('Image cache cleaning in progress.')
|
||||||
thres_size_perc_start =\
|
thres_size_perc_start = (
|
||||||
self.configuration.thres_avl_size_perc_start
|
self.configuration.thres_avl_size_perc_start)
|
||||||
thres_size_perc_stop = \
|
thres_size_perc_stop = self.configuration.thres_avl_size_perc_stop
|
||||||
self.configuration.thres_avl_size_perc_stop
|
|
||||||
for share in getattr(self, '_mounted_shares', []):
|
for share in getattr(self, '_mounted_shares', []):
|
||||||
try:
|
try:
|
||||||
total_size, total_avl = \
|
total_size, total_avl = self._get_capacity_info(share)
|
||||||
self._get_capacity_info(share)
|
|
||||||
avl_percent = int((float(total_avl) / total_size) * 100)
|
avl_percent = int((float(total_avl) / total_size) * 100)
|
||||||
if avl_percent <= thres_size_perc_start:
|
if avl_percent <= thres_size_perc_start:
|
||||||
LOG.info('Cleaning cache for share %s.', share)
|
LOG.info('Cleaning cache for share %s.', share)
|
||||||
|
|
|
@ -97,10 +97,9 @@ class DPLISCSIDriver(dplcommon.DPLCOMMONDriver,
|
||||||
break
|
break
|
||||||
|
|
||||||
if properties['target_portal'] != '':
|
if properties['target_portal'] != '':
|
||||||
properties['target_lun'] = \
|
properties['target_lun'] = int(
|
||||||
int(tgInfo['logical_unit_number'])
|
tgInfo['logical_unit_number'])
|
||||||
properties['target_iqn'] = \
|
properties['target_iqn'] = tgInfo['target_identifier']
|
||||||
tgInfo['target_identifier']
|
|
||||||
break
|
break
|
||||||
|
|
||||||
if not (ret == 0 or properties['target_portal']):
|
if not (ret == 0 or properties['target_portal']):
|
||||||
|
|
|
@ -35,10 +35,8 @@ class ISCSITarget(driver.Target):
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(ISCSITarget, self).__init__(*args, **kwargs)
|
super(ISCSITarget, self).__init__(*args, **kwargs)
|
||||||
self.iscsi_target_prefix = \
|
self.iscsi_target_prefix = self.configuration.safe_get('target_prefix')
|
||||||
self.configuration.safe_get('target_prefix')
|
self.iscsi_protocol = self.configuration.safe_get('target_protocol')
|
||||||
self.iscsi_protocol = \
|
|
||||||
self.configuration.safe_get('target_protocol')
|
|
||||||
self.protocol = 'iSCSI'
|
self.protocol = 'iSCSI'
|
||||||
self.volumes_dir = self.configuration.safe_get('volumes_dir')
|
self.volumes_dir = self.configuration.safe_get('volumes_dir')
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,7 @@ class LioAdm(iscsi.ISCSITarget):
|
||||||
super(LioAdm, self).__init__(*args, **kwargs)
|
super(LioAdm, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
# FIXME(jdg): modify executor to use the cinder-rtstool
|
# FIXME(jdg): modify executor to use the cinder-rtstool
|
||||||
self.iscsi_target_prefix =\
|
self.iscsi_target_prefix = self.configuration.safe_get('target_prefix')
|
||||||
self.configuration.safe_get('target_prefix')
|
|
||||||
|
|
||||||
self._verify_rtstool()
|
self._verify_rtstool()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue