openstack
/
nova
Code Issues Proposed changes

Merge "Trivial: use default value in next() func"

This commit is contained in:
Zuul 2019-05-03 20:30:29 +00:00 committed by Gerrit Code Review
parent b9bcbab86b 9a7eee1592
commit 09832946a3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/scheduler/host_manager.py
View File

@ -693,14 +693,13 @@ class HostManager(object):
timeout = context_module.CELL_TIMEOUT
nodes_by_cell = context_module.scatter_gather_cells(
ctxt, cells, timeout, target_fnc)
try:
# Only one cell should have a value for the compute nodes
# so we get it here
nodes = next(
nodes for nodes in nodes_by_cell.values() if nodes)
except StopIteration:
# ...or we find no node if none of the cells has a value
nodes = objects.ComputeNodeList()
# Only one cell should have values for the compute nodes
# so we get them here, or return an empty list if no cell
# has a value
nodes = next(
(nodes for nodes in nodes_by_cell.values() if nodes),
objects.ComputeNodeList())
return nodes