openstack/nova
Code Issues Proposed changes

Merge "hardware: Flatten functions"

Browse Source
This commit is contained in:
Jenkins
2016-11-24 21:23:17 +00:00
committed by Gerrit Code Review
parent eb4f9a44c7 3f0711c3e3
commit 63a363eb9d
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/virt/hardware.py
View File

@@ -1328,7 +1328,7 @@ def numa_fit_instance_to_host(
{'required': len(instance_topology),
'actual': len(host_topology)})
return
else:
# TODO(ndipanov): We may want to sort permutations differently
# depending on whether we want packing/spreading over NUMA nodes
for host_cell_perm in itertools.permutations(
@@ -1347,12 +1347,12 @@ def numa_fit_instance_to_host(
if got_cell is None:
break
cells.append(got_cell)
if len(cells) == len(host_cell_perm):
if not pci_requests:
return objects.InstanceNUMATopology(cells=cells)
elif ((pci_stats is not None) and
pci_stats.support_requests(pci_requests,
cells)):
if len(cells) != len(host_cell_perm):
continue
if not pci_requests or ((pci_stats is not None) and
pci_stats.support_requests(pci_requests, cells)):
return objects.InstanceNUMATopology(cells=cells)