Merge "Add missing condition"
This commit is contained in:
commit
b2f5ca667b
|
@ -279,6 +279,9 @@ class LibvirtLiveMigrateData(LiveMigrateData):
|
||||||
if (target_version < (1, 10) and
|
if (target_version < (1, 10) and
|
||||||
'src_supports_numa_live_migration' in primitive):
|
'src_supports_numa_live_migration' in primitive):
|
||||||
del primitive['src_supports_numa_live_migration']
|
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:
|
if target_version < (1, 10) and 'dst_numa_info' in primitive:
|
||||||
del primitive['dst_numa_info']
|
del primitive['dst_numa_info']
|
||||||
if target_version < (1, 9) and 'vifs' in primitive:
|
if target_version < (1, 9) and 'vifs' in primitive:
|
||||||
|
|
|
@ -94,8 +94,8 @@ class _TestLibvirtLiveMigrateData(object):
|
||||||
target_connect_addr='127.0.0.1',
|
target_connect_addr='127.0.0.1',
|
||||||
dst_wants_file_backed_memory=False,
|
dst_wants_file_backed_memory=False,
|
||||||
file_backed_memory_discard=False,
|
file_backed_memory_discard=False,
|
||||||
src_supports_numa_live_migraton=True,
|
src_supports_numa_live_migration=True,
|
||||||
dst_supports_numa_live_migraton=True,
|
dst_supports_numa_live_migration=True,
|
||||||
dst_numa_info=migrate_data.LibvirtLiveMigrateNUMAInfo())
|
dst_numa_info=migrate_data.LibvirtLiveMigrateNUMAInfo())
|
||||||
manifest = ovo_base.obj_tree_get_versions(obj.obj_name())
|
manifest = ovo_base.obj_tree_get_versions(obj.obj_name())
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue