diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-21 04:43:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-21 04:43:00 +0000 |
| commit | ee710e7fc574f166a4f2f7a5b58d9670f6a7c7dc (patch) | |
| tree | 9feb5dc93962cf4675032285b48a76de4ccd3831 /nova/compute | |
| parent | 1dc9d73cf0d79dc86064228ca4da23f00947b7e0 (diff) | |
| parent | 65d9f80b5bfe9e94323f31f2d109670798774466 (diff) | |
Merge "Update exceptions to pass correct kwargs."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index cc02e4a82..757f78f2d 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1496,7 +1496,8 @@ class API(base.Base): raise exception.InstanceInvalidState( attr='task_state', instance_uuid=instance['uuid'], - state=instance['task_state']) + state=instance['task_state'], + method='reboot') state = {'SOFT': task_states.REBOOTING, 'HARD': task_states.REBOOTING_HARD}[reboot_type] instance = self.update(context, instance, vm_state=vm_states.ACTIVE, @@ -1942,7 +1943,7 @@ class API(base.Base): def get_vnc_console(self, context, instance, console_type): """Get a url to an instance Console.""" if not instance['host']: - raise exception.InstanceNotReady(instance=instance) + raise exception.InstanceNotReady(instance_id=instance['uuid']) connect_info = self.compute_rpcapi.get_vnc_console(context, instance=instance, console_type=console_type) |