openstack
/
placement
Code Issues Proposed changes

Remove redundant `where` for forbidden traits 

Following on from [1], we don't need to add a `where` clause for
forbidden traits if we already added one for filtered-down providers,
because the method that gives us the filtered-down providers already
excludes providers with forbidden traits.

[1] https://review.openstack.org/#/c/602740/2/placement/objects/resource_provider.py@1446
Change-Id: Id92367b83aae2187d016e2ae3f08401827785cd4
This commit is contained in:
Eric Fried 2018-10-11 13:30:44 +00:00
parent 8ef157e083
commit ebb9f1e346
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
placement/objects/resource_provider.py
View File

@ -1443,7 +1443,10 @@ class ResourceProviderList(base.ObjectListBase, base.VersionedObject):
return []
if rp_ids:
query = query.where(rp.c.id.in_(rp_ids))
if forbidden_rp_ids:
# forbidden providers, if found, are mutually exclusive with matching
# providers above, so we only need to include this clause if we didn't
# use the positive filter above.
elif forbidden_rp_ids:
query = query.where(~rp.c.id.in_(forbidden_rp_ids))
if not resources: