Skip to content

Commit

Permalink
Merge "Clean up line continuation in Storwize driver"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Aug 30, 2015
2 parents 963d3a9 + 9b34fc5 commit ea67b21
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions cinder/volume/drivers/ibm/storwize_svc/__init__.py
Expand Up @@ -207,12 +207,12 @@ def do_setup(self, ctxt):
raise exception.InvalidInput(reason=msg)

# Check if compression is supported
self._state['compression_enabled'] = \
self._helpers.compression_enabled()
self._state['compression_enabled'] = (self._helpers.
compression_enabled())

# Get the available I/O groups
self._state['available_iogrps'] = \
self._helpers.get_available_io_groups()
self._state['available_iogrps'] = (self._helpers.
get_available_io_groups())

# Get the iSCSI and FC names of the Storwize/SVC nodes
self._state['storage_nodes'] = self._helpers.get_node_info()
Expand Down Expand Up @@ -461,8 +461,8 @@ def initialize_connection(self, volume, connector):
if len(conn_wwpns) == 0:
# TODO(xqli): Remove storwize_svc_npiv_compatibility_mode
# in M release.
npiv_compat = self.configuration.\
storwize_svc_npiv_compatibility_mode
npiv_compat = (self.configuration.
storwize_svc_npiv_compatibility_mode)
if not npiv_compat:
msg = (_('Could not get FC connection information for '
'the host-volume connection. Is the host '
Expand Down
4 changes: 2 additions & 2 deletions cinder/volume/drivers/ibm/storwize_svc/helpers.py
Expand Up @@ -643,9 +643,9 @@ def get_vdisk_copies(self, vdisk):
'secondary': None}

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',
'primary', 'mdisk_grp_name'):
'primary', 'mdisk_grp_name')):
copy = {'copy_id': copy_id,
'status': status,
'sync': sync,
Expand Down

0 comments on commit ea67b21

Please sign in to comment.