diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-24 18:25:21 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-24 18:25:21 -0400 |
| commit | 6c4329f846685ee54c5265e5cc56e58e6fbd55e9 (patch) | |
| tree | 12ad918100278ae16dd4d01c93b91abf46322868 /nova | |
| parent | 5f1380bfc69913f6aeb2a64e3501f77973493bc3 (diff) | |
stub_instance fix from merge conflict
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/api/openstack/test_server_actions.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py index eae74e75e..6fb21fad3 100644 --- a/nova/tests/api/openstack/test_server_actions.py +++ b/nova/tests/api/openstack/test_server_actions.py @@ -46,7 +46,8 @@ def return_server_with_uuid_and_state(vm_state, task_state=None): return _return_server -def stub_instance(id, metadata=None, image_ref="10", flavor_id="1", name=None): +def stub_instance(id, metadata=None, image_ref="10", flavor_id="1", + name=None, vm_state=None, task_state=None): if metadata is not None: metadata_items = [{'key':k, 'value':v} for k, v in metadata.items()] else: @@ -67,8 +68,8 @@ def stub_instance(id, metadata=None, image_ref="10", flavor_id="1", name=None): "launch_index": 0, "key_name": "", "key_data": "", - "vm_state": vm_states.ACTIVE, - "task_state": None, + "vm_state": vm_state or vm_states.ACTIVE, + "task_state": task_state, "memory_mb": 0, "vcpus": 0, "local_gb": 0, |