openstack/nova
Code Issues Proposed changes

Merge "FUP for Id7827fe8dc27112e342dc25c902c8dbc25f63b94"

Browse Source
This commit is contained in:
Zuul 2019-02-23 00:31:41 +00:00 committed by Gerrit Code Review
commit 69a13fbee0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nova/objects/request_spec.py
View File

@ -480,7 +480,8 @@ class RequestSpec(base.NovaObject):
# TODO(gibi): do the creation of the unnumbered group and any
# numbered group from the flavor by moving the logic from
# nova.scheduler.utils.resources_from_request_spec() here.
# nova.scheduler.utils.resources_from_request_spec() here. See also
# the comment in the definition of requested_resources field.
spec_obj.requested_resources = []
if port_resource_requests:
spec_obj.requested_resources.extend(port_resource_requests)
@ -701,15 +702,13 @@ class RequestSpec(base.NovaObject):
This dict contains info only about RPs
appearing in the placement_allocations param.
:return: True if each group's resource and trait request can be
fulfilled from RP it is mapped to. False otherwise.
fulfilled from the RP it is mapped to. False otherwise.
"""
# Check that traits are matching for each group - rp pair in
# this mapping
for group, rp_uuid in group_rp_mapping:
if (set(provider_traits[rp_uuid])
& set(group.required_traits)
!= set(group.required_traits)):
if not group.required_traits.issubset(provider_traits[rp_uuid]):
return False
# TODO(gibi): add support for groups with forbidden_traits and
@ -733,10 +732,10 @@ class RequestSpec(base.NovaObject):
return False
# Check that all the allocations are consumed from the resource
# classes that are appeared in the request groups. It should never
# happen that we have a match but also have some leftover if placement
# returns valid allocation candidates. Except if the leftover in the
# allocation are due to the RC requested in the unnumbered group.
# classes that appear in the request groups. It should never happen
# that we have a match but also have some leftover if placement returns
# valid allocation candidates. Except if the leftover in the allocation
# are due to the RC requested in the unnumbered group.
for rp_uuid in allocs:
rp_allocs = allocs[rp_uuid]['resources']
for rc, amount in group.resources.items():
@ -744,8 +743,8 @@ class RequestSpec(base.NovaObject):
if rp_allocs[rc] != 0:
LOG.debug(
'Found valid group - RP mapping %s but there are '
'allocation leftover in %s',
group_rp_mapping, allocs)
'allocations leftover in %s from resource class '
'%s', group_rp_mapping, allocs, rc)
return False
# If both the traits and the allocations are OK then mapping is valid
@ -767,6 +766,7 @@ class RequestSpec(base.NovaObject):
required traits, aggregate membership and forbidden traits are not
supported.
* requesting the same resource class in numbered and un-numbered group
is not supported
We can live with these limitations today as Neutron does not use
forbidden traits and aggregates in the request and each Neutron port is

6
nova/tests/unit/objects/test_request_spec.py
View File

@ -1342,7 +1342,7 @@ class TestMappingRequestGroupsToProviders(test.NoDBTestCase):
'CUSTOM_PHYSNET_PHYSNET0', 'CUSTOM_VNIC_TYPE_NORMAL'
],
}
# this fits to 3 RPs
# this fits to 2 RPs
group1 = request_spec.RequestGroup(
resources={
"NET_BW_IGR_KILOBIT_PER_SEC": 1,
@ -1395,7 +1395,7 @@ class TestMappingRequestGroupsToProviders(test.NoDBTestCase):
# NOTE(gibi): This negative test scenario should not happen in real
# end to end test as we assume that placement only returns candidates
# that are valid and this candidate is not valid as it provides more
# resources that the ports are requesting. Still we want to cover the
# resources than the ports are requesting. Still we want to cover the
# error case in our implementation
allocations = collections.OrderedDict()
@ -1449,4 +1449,4 @@ class TestMappingRequestGroupsToProviders(test.NoDBTestCase):
ValueError, self.spec.map_requested_resources_to_providers,
allocations, provider_traits)
self.assertIn('allocation leftover', mock_debug.mock_calls[3][1][0])
self.assertIn('allocations leftover', mock_debug.mock_calls[3][1][0])