From 3aa77a3999a7dcabbd4c0141d4c56b07a4624128 Mon Sep 17 00:00:00 2001 From: Rajesh Tailor Date: Fri, 27 May 2022 09:51:11 +0530 Subject: [PATCH] Add missing condition Change [1] added new fields 'src|dst_supports_numa_live_migration' to LibvirtLiveMigrateData object, but missed if condition for dst_supports_numa_live_migration field in obj_make_compatible method. This change adds the if condition as well as fix typo in unit test because of which this wasn't catched earlier. Closes-Bug: #1975891 Change-Id: Ice5a2c7aca77f47ea6328a10d835854d9aff408e --- nova/objects/migrate_data.py | 3 +++ nova/tests/unit/objects/test_migrate_data.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nova/objects/migrate_data.py b/nova/objects/migrate_data.py index 06f30342e54f..cf0e4bf9a311 100644 --- a/nova/objects/migrate_data.py +++ b/nova/objects/migrate_data.py @@ -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: diff --git a/nova/tests/unit/objects/test_migrate_data.py b/nova/tests/unit/objects/test_migrate_data.py index bc04c5bd13a3..7f587c690647 100644 --- a/nova/tests/unit/objects/test_migrate_data.py +++ b/nova/tests/unit/objects/test_migrate_data.py @@ -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())