openstack/cinder
Code Issues Proposed changes

Merge "bump pycodestyle to 2.6.0"

Browse Source
This commit is contained in:
Zuul 2020-06-19 16:12:17 +00:00 committed by Gerrit Code Review
commit 45868bd061
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/contrib/services.py
View File

@ -216,7 +216,7 @@ class ServiceController(wsgi.Controller):
log_req) log_req)
result.append({'host': service.host, result.append({'host': service.host,
'binary': service.binary, 'binary': service.binary,
'levels': {l.prefix: l.level for l in levels}}) 'levels': {le.prefix: le.level for le in levels}})
return {'log_levels': result} return {'log_levels': result}

2
cinder/volume/drivers/dell_emc/vnx/client.py
View File

@ -545,7 +545,7 @@ class Client(object):
self.vnx.remove_hba(initiator_uid) self.vnx.remove_hba(initiator_uid)
def update_consistencygroup(self, cg, lun_ids_to_add, lun_ids_to_remove): def update_consistencygroup(self, cg, lun_ids_to_add, lun_ids_to_remove):
lun_ids_in_cg = (set([l.lun_id for l in cg.lun_list]) if cg.lun_list lun_ids_in_cg = (set([lu.lun_id for lu in cg.lun_list]) if cg.lun_list
else set()) else set())
# lun_ids_to_add and lun_ids_to_remove never overlap. # lun_ids_to_add and lun_ids_to_remove never overlap.

10
cinder/volume/drivers/kaminario/kaminario_common.py
View File

@ -520,10 +520,10 @@ class KaminarioCinderDriver(cinder.volume.driver.ISCSIDriver):
def _is_user_snap_sync_finished(self): def _is_user_snap_sync_finished(self):
# waiting for user snapshot to be synced # waiting for user snapshot to be synced
while len(self.snap_updates) > 0: while len(self.snap_updates) > 0:
for l in self.snap_updates: for update in self.snap_updates:
sess = l.get('tgt_ssn') sess = update.get('tgt_ssn')
gno = l.get('gno') gno = update.get('gno')
stime = l.get('stime') stime = update.get('stime')
sess.refresh() sess.refresh()
if (sess.generation_number == gno and if (sess.generation_number == gno and
sess.current_snapshot_progress == 100 sess.current_snapshot_progress == 100
@ -535,7 +535,7 @@ class KaminarioCinderDriver(cinder.volume.driver.ISCSIDriver):
self.snap_updates.append({'tgt_ssn': sess, self.snap_updates.append({'tgt_ssn': sess,
'gno': gen_no, 'gno': gen_no,
'stime': time.time()}) 'stime': time.time()})
self.snap_updates.remove(l) self.snap_updates.remove(update)
eventlet.sleep(1) eventlet.sleep(1)
@utils.trace @utils.trace

4
cinder/volume/drivers/quobyte.py
View File

@ -657,8 +657,8 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
"""Mount Quobyte volume to mount path.""" """Mount Quobyte volume to mount path."""
mounted = False mounted = False
with QuobyteDriver.read_proc_mount() as proc_mount: with QuobyteDriver.read_proc_mount() as proc_mount:
for l in proc_mount: for line in proc_mount:
if l.split()[1] == mount_path: if line.split()[1] == mount_path:
mounted = True mounted = True
break break

2
lower-constraints.txt
View File

@ -97,7 +97,7 @@ psycopg2==2.7
pyasn1-modules==0.2.1 pyasn1-modules==0.2.1
pyasn1==0.4.2 pyasn1==0.4.2
pycadf==2.7.0 pycadf==2.7.0
pycodestyle==2.5.0 pycodestyle==2.6.0
pycparser==2.19 pycparser==2.19
pyflakes==0.8.1 pyflakes==0.8.1
Pygments==2.2.0 Pygments==2.2.0

2
test-requirements.txt
View File

@ -12,7 +12,7 @@ coverage!=4.4,>=4.1 # Apache-2.0
ddt>=1.2.1 # MIT ddt>=1.2.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
pycodestyle==2.5.0 # MIT License pycodestyle==2.6.0 # MIT License
PyMySQL>=0.7.6 # MIT License PyMySQL>=0.7.6 # MIT License
psycopg2>=2.7 # LGPL/ZPL psycopg2>=2.7 # LGPL/ZPL
SQLAlchemy-Utils>=0.36.1 # BSD License SQLAlchemy-Utils>=0.36.1 # BSD License