Merge "objects: Update keypairs when saving an instance" into stable/queens

1 files changed, 20 insertions, 4 deletions

diff --git a/nova/tests/unit/objects/test_instance.py b/nova/tests/unit/objects/test_instance.py
index 14798e36de..45d54f6201 100644
--- a/nova/tests/unit/objects/test_instance.py
+++ b/nova/tests/unit/objects/test_instance.py
@@ -683,14 +683,30 @@ class _TestInstanceObject(object):
         inst.numa_topology = None
         inst.migration_context = None
         inst.vcpu_model = test_vcpu_model.fake_vcpumodel
-        inst.save()
+        inst.keypairs = objects.KeyPairList(
+            objects=[objects.KeyPair(name='foo')])
+
         json_vcpu_model = jsonutils.dumps(
             test_vcpu_model.fake_vcpumodel.obj_to_primitive())
-        expected_vals = {'numa_topology': None,
-                         'migration_context': None,
-                         'vcpu_model': json_vcpu_model}
+        json_keypairs = jsonutils.dumps(inst.keypairs.obj_to_primitive())
+
+        # Check changed fields in the instance object
+        self.assertIn('keypairs', inst.obj_what_changed())
+        self.assertEqual({'objects'}, inst.keypairs.obj_what_changed())
+
+        inst.save()
+
+        expected_vals = {
+            'numa_topology': None,
+            'migration_context': None,
+            'vcpu_model': json_vcpu_model,
+            'keypairs': json_keypairs,
+        }
         mock_update.assert_called_once_with(self.context, inst.uuid,
                                             expected_vals)
+        # Verify that the record of changed fields has been cleared
+        self.assertNotIn('keypairs', inst.obj_what_changed())
+        self.assertEqual(set(), inst.keypairs.obj_what_changed())
 
     @mock.patch.object(notifications, 'send_update')
     @mock.patch.object(cells_rpcapi.CellsAPI, 'instance_update_from_api')