From 92d6fc0534b0b64d85d1be4c04b3382457afece6 Mon Sep 17 00:00:00 2001 From: Tetsuro Nakamura Date: Sun, 1 Apr 2018 09:02:28 +0900 Subject: [PATCH] trivial: Fix nits in code comments Addresses the following minor/nonblocking review comments: https://review.openstack.org/#/c/533396/8/nova/api/openstack/placement/objects/resource_provider.py@3243 https://review.openstack.org/#/c/533396/8/nova/api/openstack/placement/objects/resource_provider.py@3259 Change-Id: Iecefcd222eac9058964c5376af600e8d9d2608dd --- .../openstack/placement/objects/resource_provider.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nova/api/openstack/placement/objects/resource_provider.py b/nova/api/openstack/placement/objects/resource_provider.py index 70504e9954b5..dffcd0acdbaf 100644 --- a/nova/api/openstack/placement/objects/resource_provider.py +++ b/nova/api/openstack/placement/objects/resource_provider.py @@ -3238,10 +3238,10 @@ def _alloc_candidates_with_shared(ctx, requested_resources, required_traits, """Returns a tuple of (allocation requests, provider summaries) for a supplied set of requested resource amounts and resource providers. - The allocation requests will contain resource providers that EITHER have - all the resources to satisfy each requested resource amount OR can satisfy - some of the requested resources AND are associated by aggregate to a - resource provider that shares the missing resources with it. + The allocation requests will contain BOTH resource providers that locally + have all the resources to satisfy each requested resource amount AND + combinations of resource providers and shared providers in same aggregate + that can collectively satisfy requested resource. :param ctx: nova.context.RequestContext object :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 provider IDs for all providers that are NOT sharing a 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 """ # We need to grab usage information for all the providers identified as