diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-13 23:34:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-13 23:34:45 +0000 |
| commit | 540342ba74c2eb4ad6ea4aff40346b779f8876d5 (patch) | |
| tree | 49b3a8fa30bd51af13e68235aee21c3639badade /nova | |
| parent | 68e521ad4b8892cbb0ae4a5b39b3a7fd9d22f353 (diff) | |
| parent | fe1fd8247450991b041c261ad3f8c7d0ae3b8d7a (diff) | |
| download | nova-540342ba74c2eb4ad6ea4aff40346b779f8876d5.tar.gz | |
Merge "cells: don't pass context to instance.save in instance_update_from_api"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/cells/messaging.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/cells/test_cells_messaging.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py index e47da9df9a..8734b7aa7b 100644 --- a/nova/cells/messaging.py +++ b/nova/cells/messaging.py @@ -828,7 +828,7 @@ class _TargetedMessageMethods(_BaseMessageMethods): # NOTE(alaski): A cell should be authoritative for its system_metadata # and metadata so we don't want to sync it down from the api. instance.obj_reset_changes(['metadata', 'system_metadata']) - instance.save(message.ctxt, expected_vm_state=expected_vm_state, + instance.save(expected_vm_state=expected_vm_state, expected_task_state=expected_task_state) def _call_compute_api_with_obj(self, ctxt, instance, method, *args, diff --git a/nova/tests/unit/cells/test_cells_messaging.py b/nova/tests/unit/cells/test_cells_messaging.py index a10a38b564..6b16b5e9e5 100644 --- a/nova/tests/unit/cells/test_cells_messaging.py +++ b/nova/tests/unit/cells/test_cells_messaging.py @@ -1205,7 +1205,7 @@ class CellsTargetedMethodsTestCase(test.TestCase): self.assertEqual(set(['user_data']), instance.obj_what_changed()) - instance.save(self.ctxt, expected_task_state='exp_task', + instance.save(expected_task_state='exp_task', expected_vm_state='exp_vm').WithSideEffects( _check_object) |