openstack/nova
Code Issues Proposed changes

Merge "Pass instance object to add_instance_fault_from_exc"

Browse Source
This commit is contained in:
Jenkins
2015-03-31 19:56:01 +00:00
committed by Gerrit Code Review
parent bd4788d473 bfced2f5e2
commit 3d15f25b13
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/scheduler/utils.py
View File

@@ -104,7 +104,7 @@ def set_vm_state_and_notify(context, instance_uuid, service, method, updates,
expected_attrs=['system_metadata']) expected_attrs=['system_metadata'])
notifications.send_update(context, old_ref, inst_obj, service=service) notifications.send_update(context, old_ref, inst_obj, service=service)
compute_utils.add_instance_fault_from_exc(context, compute_utils.add_instance_fault_from_exc(context,
new_ref, ex, sys.exc_info()) inst_obj, ex, sys.exc_info())
payload = dict(request_spec=request_spec, payload = dict(request_spec=request_spec,
instance_properties=properties, instance_properties=properties,

2
nova/tests/unit/scheduler/test_scheduler_utils.py
View File

@@ -99,7 +99,7 @@ class SchedulerUtilsTestCase(test.NoDBTestCase):
service=service) service=service)
compute_utils.add_instance_fault_from_exc( compute_utils.add_instance_fault_from_exc(
self.context, self.context,
new_ref, exc_info, mox.IsA(tuple)) inst_obj, exc_info, mox.IsA(tuple))
payload = dict(request_spec=request_spec, payload = dict(request_spec=request_spec,
instance_properties=request_spec.get( instance_properties=request_spec.get(