Merge "Add missing condition" into stable/xena

openstack · Jun 18, 2022 · 3872647 · 3872647
2 parents 730b9b0 + 7c40596
commit 3872647
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nova/objects/migrate_data.py b/nova/objects/migrate_data.py
@@ -279,6 +279,9 @@ def obj_make_compatible(self, primitive, target_version):
         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
@@ -94,8 +94,8 @@ def test_obj_make_compatible(self):
             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())