diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-20 07:31:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-20 07:31:58 +0000 |
| commit | 81c226473e30a40f09507be00e702c35e4667df4 (patch) | |
| tree | 38b91cffc905591e750fe14b659a2ae9d6458c57 | |
| parent | de4bc876d42986d6fd32137614b9c44d64bc5a7f (diff) | |
| parent | d535f2d119c04f8785c7883bfbd14c10b0f01300 (diff) | |
| download | nova-81c226473e30a40f09507be00e702c35e4667df4.tar.gz | |
Merge "Make cells 'flavorid' for resizes" into stable/havana
| -rw-r--r-- | nova/cells/messaging.py | 2 | ||||
| -rw-r--r-- | nova/tests/cells/test_cells_messaging.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py index 410084503a..76b5177c4c 100644 --- a/nova/cells/messaging.py +++ b/nova/cells/messaging.py @@ -875,7 +875,7 @@ class _TargetedMessageMethods(_BaseMessageMethods): extra_instance_updates): """Resize an instance via compute_api.resize().""" self._call_compute_api_with_obj(message.ctxt, instance, 'resize', - flavor_id=flavor['id'], + flavor_id=flavor['flavorid'], **extra_instance_updates) def live_migrate_instance(self, message, instance, block_migration, diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py index 59de188812..131dc5edba 100644 --- a/nova/tests/cells/test_cells_messaging.py +++ b/nova/tests/cells/test_cells_messaging.py @@ -1246,9 +1246,9 @@ class CellsTargetedMethodsTestCase(test.TestCase): self._test_instance_action_method('unpause', (), {}, (), {}, False) def test_resize_instance(self): - kwargs = dict(flavor=dict(id=42), + kwargs = dict(flavor=dict(id=42, flavorid='orangemocchafrappuccino'), extra_instance_updates=dict(cow='moo')) - expected_kwargs = dict(flavor_id=42, cow='moo') + expected_kwargs = dict(flavor_id='orangemocchafrappuccino', cow='moo') self._test_instance_action_method('resize', (), kwargs, (), expected_kwargs, False) |