openstack/nova
Code Issues Proposed changes

Rename '_numa_get_constraints_XXX' functions

Browse Source 
These don't actually return constraints but topologies. Rename and
group them together.

Change-Id: Id9627839c38798704dbffac3b52dfd4c4046b598
This commit is contained in:
Stephen Finucane
2016-10-11 16:10:01 +01:00
parent c65f1bdc5e
commit 0e7e3e18c7
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
nova/virt/hardware.py
View File

@@ -1183,7 +1183,25 @@ def _get_cpu_thread_policy_constraints(flavor, image_meta):
return policy
def _numa_get_constraints_manual(nodes, flavor, cpu_list, mem_list):
def _get_numa_topology_auto(nodes, flavor):
if ((flavor.vcpus % nodes) > 0 or
(flavor.memory_mb % nodes) > 0):
raise exception.ImageNUMATopologyAsymmetric()
cells = []
for node in range(nodes):
ncpus = int(flavor.vcpus / nodes)
mem = int(flavor.memory_mb / nodes)
start = node * ncpus
cpuset = set(range(start, start + ncpus))
cells.append(objects.InstanceNUMACell(
id=node, cpuset=cpuset, memory=mem))
return objects.InstanceNUMATopology(cells=cells)
def _get_numa_topology_manual(nodes, flavor, cpu_list, mem_list):
cells = []
totalmem = 0
@@ -1248,24 +1266,6 @@ def vcpus_realtime_topology(flavor, image):
return vcpus_rt
def _numa_get_constraints_auto(nodes, flavor):
if ((flavor.vcpus % nodes) > 0 or
(flavor.memory_mb % nodes) > 0):
raise exception.ImageNUMATopologyAsymmetric()
cells = []
for node in range(nodes):
ncpus = int(flavor.vcpus / nodes)
mem = int(flavor.memory_mb / nodes)
start = node * ncpus
cpuset = set(range(start, start + ncpus))
cells.append(objects.InstanceNUMACell(
id=node, cpuset=cpuset, memory=mem))
return objects.InstanceNUMATopology(cells=cells)
def get_emulator_threads_constraint(flavor, image_meta):
"""Determines the emulator threads policy"""
emu_threads_policy = flavor.get('extra_specs', {}).get(
@@ -1379,10 +1379,10 @@ def numa_get_constraints(flavor, image_meta):
raise exception.ImageNUMATopologyIncomplete()
if cpu_list is None:
numa_topology = _numa_get_constraints_auto(
numa_topology = _get_numa_topology_auto(
nodes, flavor)
else:
numa_topology = _numa_get_constraints_manual(
numa_topology = _get_numa_topology_manual(
nodes, flavor, cpu_list, mem_list)
# We currently support same pagesize for all cells.