openstack/placement
Code Issues Proposed changes

Merge "Use trait strings in ProviderSummary objects"

Browse Source
This commit is contained in:
Zuul
2019-05-29 02:53:43 +00:00
committed by Gerrit Code Review
parent d1abad4e48 5f4da5e040
commit c81f62d501
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
placement/handlers/allocation_candidate.py
View File

@@ -192,8 +192,7 @@ def _transform_provider_summaries(p_sums, requests, want_version):
ret[ps.resource_provider.uuid] = {'resources': resources}
if include_traits:
ret[ps.resource_provider.uuid]['traits'] = [
t.name for t in ps.traits]
ret[ps.resource_provider.uuid]['traits'] = ps.traits
if enable_nested_providers:
ret[ps.resource_provider.uuid]['parent_provider_uuid'] = (

8
placement/objects/allocation_candidate.py
View File

@@ -484,7 +484,7 @@ def _alloc_candidates_single_provider(ctx, requested_resources, rp_tuples):
alloc_requests.append(req_obj)
# If this is a sharing provider, we have to include an extra
# AllocationRequest for every possible anchor.
traits = [trait.name for trait in rp_summary.traits]
traits = rp_summary.traits
if os_traits.MISC_SHARES_VIA_AGGREGATE in traits:
anchors = set([p[1] for p in rp_obj.anchors_for_sharing_providers(
ctx, [rp_summary.resource_provider.id])])
@@ -567,9 +567,7 @@ def _build_provider_summaries(context, usages, prov_traits):
)
summaries[rp_id] = summary
traits = prov_traits[rp_id]
summary.traits = [trait_obj.Trait(context, name=tname)
for tname in traits]
summary.traits = prov_traits[rp_id]
rc_id = usage['resource_class_id']
if rc_id is None:
@@ -627,7 +625,7 @@ def _check_traits_for_alloc_request(res_requests, summaries, required_traits,
for res_req in res_requests:
rp_id = res_req.resource_provider.id
rp_summary = summaries[rp_id]
rp_traits = set([trait.name for trait in rp_summary.traits])
rp_traits = set(rp_summary.traits)
# Check if there are forbidden_traits
conflict_traits = set(forbidden_traits) & set(rp_traits)

2
placement/tests/functional/db/test_allocation_candidates.py
View File

@@ -955,7 +955,7 @@ class AllocationCandidatesTestCase(tb.PlacementDbBaseTestCase):
observed = {}
for psum in candidates.provider_summaries:
rpname = self.rp_uuid_to_name[psum.resource_provider.uuid]
observed[rpname] = set(trait.name for trait in psum.traits)
observed[rpname] = set(psum.traits)
self.assertEqual(expected, observed)