openstack/cinder
Code Issues Proposed changes

Merge "Clean up line continuation in Storwize driver"

Browse Source
This commit is contained in:
Jenkins 2015-08-30 14:19:37 +00:00 committed by Gerrit Code Review
commit ea67b21c72
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/volume/drivers/ibm/storwize_svc/__init__.py
View File

@ -207,12 +207,12 @@ class StorwizeSVCDriver(san.SanDriver,
raise exception.InvalidInput(reason=msg) raise exception.InvalidInput(reason=msg)
# Check if compression is supported # Check if compression is supported
self._state['compression_enabled'] = \ self._state['compression_enabled'] = (self._helpers.
self._helpers.compression_enabled() compression_enabled())
# Get the available I/O groups # Get the available I/O groups
self._state['available_iogrps'] = \ self._state['available_iogrps'] = (self._helpers.
self._helpers.get_available_io_groups() get_available_io_groups())
# Get the iSCSI and FC names of the Storwize/SVC nodes # Get the iSCSI and FC names of the Storwize/SVC nodes
self._state['storage_nodes'] = self._helpers.get_node_info() self._state['storage_nodes'] = self._helpers.get_node_info()
@ -461,8 +461,8 @@ class StorwizeSVCDriver(san.SanDriver,
if len(conn_wwpns) == 0: if len(conn_wwpns) == 0:
# TODO(xqli): Remove storwize_svc_npiv_compatibility_mode # TODO(xqli): Remove storwize_svc_npiv_compatibility_mode
# in M release. # in M release.
npiv_compat = self.configuration.\ npiv_compat = (self.configuration.
storwize_svc_npiv_compatibility_mode storwize_svc_npiv_compatibility_mode)
if not npiv_compat: if not npiv_compat:
msg = (_('Could not get FC connection information for ' msg = (_('Could not get FC connection information for '
'the host-volume connection. Is the host ' 'the host-volume connection. Is the host '

4
cinder/volume/drivers/ibm/storwize_svc/helpers.py
View File

@ -643,9 +643,9 @@ class StorwizeHelpers(object):
'secondary': None} 'secondary': None}
resp = self.ssh.lsvdiskcopy(vdisk) resp = self.ssh.lsvdiskcopy(vdisk)
for copy_id, status, sync, primary, mdisk_grp in \ for copy_id, status, sync, primary, mdisk_grp in (
resp.select('copy_id', 'status', 'sync', resp.select('copy_id', 'status', 'sync',
'primary', 'mdisk_grp_name'): 'primary', 'mdisk_grp_name')):
copy = {'copy_id': copy_id, copy = {'copy_id': copy_id,
'status': status, 'status': status,
'sync': sync, 'sync': sync,