openstack
/
nova
Code Issues Proposed changes

Merge "Handle volume-backed instances in IsolatedHostsFilter" into stable/ocata

This commit is contained in:
Zuul 2018-04-17 16:05:34 +00:00 committed by Gerrit Code Review
parent 51b7d45e9a 88c51bde8c
commit fe4afe2e4b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/scheduler/filters/isolated_hosts_filter.py
View File

@ -59,7 +59,10 @@ class IsolatedHostsFilter(filters.BaseHostFilter):
return ((not restrict_isolated_hosts_to_isolated_images) or
(host_state.host not in isolated_hosts))
image_ref = spec_obj.image.id if spec_obj.image else None
# Check to see if the image id is set since volume-backed instances
# can be created without an imageRef in the server create request.
image_ref = spec_obj.image.id \
if spec_obj.image and 'id' in spec_obj.image else None
image_isolated = image_ref in isolated_images
host_isolated = host_state.host in isolated_hosts

12
nova/tests/functional/regressions/test_bug_1746483.py
View File

@ -96,7 +96,11 @@ class TestBootFromVolumeIsolatedHostsFilter(
# networks='none'.
with utils.temporary_mutation(self.api, microversion='2.37'):
server = self.api.post_server(server_req_body)
server = self._wait_for_state_change(self.api, server, 'ERROR')
# Due to bug 1746483 we expect scheduling to fail.
self.assertIn("Cannot load 'id' in the base class",
server['fault']['message'])
server = self._wait_for_state_change(self.api, server, 'ACTIVE')
# NOTE(mriedem): The instance is successfully scheduled but since
# the image_id from the volume_image_metadata isn't stored in the
# RequestSpec.image.id, and restrict_isolated_hosts_to_isolated_images
# is True, the isolated host (host1) is filtered out because the
# filter doesn't have enough information to know if the image within
# the volume can be used on that host.
self.assertEqual('host2', server['OS-EXT-SRV-ATTR:host'])