summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-21 04:43:00 +0000
committerGerrit Code Review <review@openstack.org>2012-12-21 04:43:00 +0000
commitee710e7fc574f166a4f2f7a5b58d9670f6a7c7dc (patch)
tree9feb5dc93962cf4675032285b48a76de4ccd3831 /nova/virt
parent1dc9d73cf0d79dc86064228ca4da23f00947b7e0 (diff)
parent65d9f80b5bfe9e94323f31f2d109670798774466 (diff)
Merge "Update exceptions to pass correct kwargs."
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/fake.py2
-rw-r--r--nova/virt/libvirt/driver.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 77f600e22..c9cd41680 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -124,7 +124,7 @@ class FakeDriver(driver.ComputeDriver):
def snapshot(self, context, instance, name):
if not instance['name'] in self.instances:
- raise exception.InstanceNotRunning()
+ raise exception.InstanceNotRunning(instance_id=instance['uuid'])
def reboot(self, instance, network_info, reboot_type,
block_device_info=None):
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 85ff91218..dc1ab3936 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -821,7 +821,7 @@ class LibvirtDriver(driver.ComputeDriver):
try:
virt_dom = self._lookup_by_name(instance['name'])
except exception.InstanceNotFound:
- raise exception.InstanceNotRunning()
+ raise exception.InstanceNotRunning(instance_id=instance['uuid'])
(image_service, image_id) = glance.get_remote_image_service(
context, instance['image_ref'])