diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-05-01 17:31:26 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-05-02 16:05:58 -0400 |
| commit | 29dc47bd5045853d83a2343ec88c36ea89db188d (patch) | |
| tree | 4a7d4696ceed6ddf34976445bf90a14480e1170e /nova/virt | |
| parent | 1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1 (diff) | |
Use save_and_reraise_exception() from common.
This patch common.excutils from openstack-common, which includes
save_and_reraise_exception(). The patch also converts the code
base to use it from there instead of nova.utils and then removes
it from nova.utils.
The initial motivation for this was removing another nova dependency
from nova.rpc so that it can eventually be moved to openstack-common.
Change-Id: I7354ca51a02aec9c709cf33f77d4abc46acc2742
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/connection.py | 3 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 42b6cbdbd..6d97ce170 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -64,6 +64,7 @@ from nova import flags import nova.image from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import excutils from nova.openstack.common import importutils from nova import utils from nova.virt import driver @@ -2220,7 +2221,7 @@ class LibvirtConnection(driver.ComputeDriver): FLAGS.live_migration_bandwidth) except Exception: - with utils.save_and_reraise_exception(): + with excutils.save_and_reraise_exception(): recover_method(ctxt, instance_ref, dest, block_migration) # Waiting for completion of live_migration. diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 9c478afab..540a144c8 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -35,14 +35,15 @@ from xml.parsers import expat from eventlet import greenthread +from nova.compute import instance_types +from nova.compute import power_state from nova import exception from nova import flags from nova.image import glance from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import excutils from nova import utils -from nova.compute import instance_types -from nova.compute import power_state from nova.virt.disk import api as disk from nova.virt import xenapi from nova.virt.xenapi import volume_utils @@ -558,7 +559,7 @@ class VMHelper(xenapi.HelperBase): cls.create_vbd(session, vm_ref, vdi_ref, userdevice, bootable=False) except Exception: - with utils.save_and_reraise_exception(): + with excutils.save_and_reraise_exception(): cls.destroy_vdi(session, vdi_ref) @classmethod |