diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-04 00:16:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-04 00:16:15 +0000 |
| commit | de7a8f9e443b7cf20c18e8637b43e0f2bfada31c (patch) | |
| tree | 79e9664fe092e892514c335721c4fc8d26114bd4 | |
| parent | 2c1596b78f8e491ce597b5b6d11c37ed17cdf89f (diff) | |
| parent | 9cbd2aeddec61c58aad5fd3efcf16c65612d2db7 (diff) | |
| download | nova-de7a8f9e443b7cf20c18e8637b43e0f2bfada31c.tar.gz | |
Merge "fix up numa-topology live migration hypervisor check" into stable/queens17.0.11
| -rw-r--r-- | nova/conductor/tasks/live_migrate.py | 5 | ||||
| -rw-r--r-- | nova/tests/unit/conductor/tasks/test_live_migrate.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nova/conductor/tasks/live_migrate.py b/nova/conductor/tasks/live_migrate.py index 07b183f706..0cb7d45271 100644 --- a/nova/conductor/tasks/live_migrate.py +++ b/nova/conductor/tasks/live_migrate.py @@ -152,7 +152,10 @@ class LiveMigrationTask(base.TaskBase): # HyperV's vNUMA feature doesn't allow specific pinning hypervisor_type = objects.ComputeNode.get_by_host_and_nodename( self.context, self.source, self.instance.node).hypervisor_type - if hypervisor_type != obj_fields.HVType.KVM: + + # KVM is not a hypervisor, so when using a virt_type of "kvm" the + # hypervisor_type will still be "QEMU". + if hypervisor_type.lower() != obj_fields.HVType.QEMU: return msg = ('Instance has an associated NUMA topology. ' diff --git a/nova/tests/unit/conductor/tasks/test_live_migrate.py b/nova/tests/unit/conductor/tasks/test_live_migrate.py index 498939954d..8647523f8a 100644 --- a/nova/tests/unit/conductor/tasks/test_live_migrate.py +++ b/nova/tests/unit/conductor/tasks/test_live_migrate.py @@ -210,7 +210,7 @@ class LiveMigrationTaskTestCase(test.NoDBTestCase): def test_check_instance_has_no_numa_fails(self, mock_get): self.flags(enable_numa_live_migration=False, group='workarounds') mock_get.return_value = objects.ComputeNode( - uuid=uuids.cn1, hypervisor_type='kvm') + uuid=uuids.cn1, hypervisor_type='QEMU') self.task.instance.numa_topology = objects.InstanceNUMATopology( cells=[objects.InstanceNUMACell(id=0, cpuset=set([0]), memory=1024)]) |