openstack
/
nova
Code Issues Proposed changes

Merge "trivial: Fix nits in code comments"

This commit is contained in:
Zuul 2018-04-04 17:12:02 +00:00 committed by Gerrit Code Review
parent dd65cad17d 92d6fc0534
commit 57ff0c34be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/api/openstack/placement/objects/resource_provider.py
View File

@ -3238,10 +3238,10 @@ def _alloc_candidates_with_shared(ctx, requested_resources, required_traits,
"""Returns a tuple of (allocation requests, provider summaries) for a """Returns a tuple of (allocation requests, provider summaries) for a
supplied set of requested resource amounts and resource providers. supplied set of requested resource amounts and resource providers.
The allocation requests will contain resource providers that EITHER have The allocation requests will contain BOTH resource providers that locally
all the resources to satisfy each requested resource amount OR can satisfy have all the resources to satisfy each requested resource amount AND
some of the requested resources AND are associated by aggregate to a combinations of resource providers and shared providers in same aggregate
resource provider that shares the missing resources with it. that can collectively satisfy requested resource.
:param ctx: nova.context.RequestContext object :param ctx: nova.context.RequestContext object
:param requested_resources: dict, keyed by resource class ID, of amounts :param requested_resources: dict, keyed by resource class ID, of amounts
@ -3256,7 +3256,7 @@ def _alloc_candidates_with_shared(ctx, requested_resources, required_traits,
resources. In other words, this is the list of resource resources. In other words, this is the list of resource
provider IDs for all providers that are NOT sharing a provider IDs for all providers that are NOT sharing a
resource. resource.
:param sharing: dict, keyed by resource class ID, of a set of resource :param sharing: dict, keyed by resource class ID, of a list of resource
provider IDs that share that resource class provider IDs that share that resource class
""" """
# We need to grab usage information for all the providers identified as # We need to grab usage information for all the providers identified as