openstack
/
nova
Code Issues Proposed changes

Merge "Add missing condition"

This commit is contained in:
Zuul 2022-05-30 16:54:22 +00:00 committed by Gerrit Code Review
parent 6906e17f79 3aa77a3999
commit b2f5ca667b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/objects/migrate_data.py
View File

@ -279,6 +279,9 @@ class LibvirtLiveMigrateData(LiveMigrateData):
if (target_version < (1, 10) and
'src_supports_numa_live_migration' in primitive):
del primitive['src_supports_numa_live_migration']
if (target_version < (1, 10) and
'dst_supports_numa_live_migration' in primitive):
del primitive['dst_supports_numa_live_migration']
if target_version < (1, 10) and 'dst_numa_info' in primitive:
del primitive['dst_numa_info']
if target_version < (1, 9) and 'vifs' in primitive:

4
nova/tests/unit/objects/test_migrate_data.py
View File

@ -94,8 +94,8 @@ class _TestLibvirtLiveMigrateData(object):
target_connect_addr='127.0.0.1',
dst_wants_file_backed_memory=False,
file_backed_memory_discard=False,
src_supports_numa_live_migraton=True,
dst_supports_numa_live_migraton=True,
src_supports_numa_live_migration=True,
dst_supports_numa_live_migration=True,
dst_numa_info=migrate_data.LibvirtLiveMigrateNUMAInfo())
manifest = ovo_base.obj_tree_get_versions(obj.obj_name())