diff options
| author | Yun Mao <yunmao@gmail.com> | 2012-07-12 15:49:58 -0400 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2012-07-12 15:49:58 -0400 |
| commit | 186d5636df4ebe063f61de0b34ad55739e0bc09a (patch) | |
| tree | c5363b2b661fff284bb2e9451510efce5e8ac408 | |
| parent | 70f503b031ad596bf45689a6ad942c1c8549b7ff (diff) | |
| download | nova-186d5636df4ebe063f61de0b34ad55739e0bc09a.tar.gz nova-186d5636df4ebe063f61de0b34ad55739e0bc09a.tar.xz nova-186d5636df4ebe063f61de0b34ad55739e0bc09a.zip | |
Use _lookup_by_name instead of _conn.lookupByName
use the helper function instead of the libvirt call directly
to allow NovaExceptions instead of libvirt exceptions to be thrown.
Change-Id: Ieac171e1a2bce1f5542ae73f3d8f6b7a5ccfa8f7
| -rw-r--r-- | nova/virt/libvirt/driver.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 43b3f9385..64be7b8af 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -395,9 +395,9 @@ class LibvirtDriver(driver.ComputeDriver): def instance_exists(self, instance_id): """Efficient override of base instance_exists method.""" try: - self._conn.lookupByName(instance_id) + self._lookup_by_name(instance_id) return True - except libvirt.libvirtError: + except exception.NovaException: return False # TODO(Shrews): Remove when libvirt Bugzilla bug # 836647 is fixed. @@ -883,7 +883,7 @@ class LibvirtDriver(driver.ComputeDriver): existing domain. """ - virt_dom = self._conn.lookupByName(instance['name']) + virt_dom = self._lookup_by_name(instance['name']) # NOTE(itoumsn): Use XML delived from the running instance. if not xml: xml = virt_dom.XMLDesc(0) @@ -952,7 +952,7 @@ class LibvirtDriver(driver.ComputeDriver): @exception.wrap_exception() def resume_state_on_host_boot(self, context, instance, network_info): """resume guest state when a host is booted""" - virt_dom = self._conn.lookupByName(instance['name']) + virt_dom = self._lookup_by_name(instance['name']) xml = virt_dom.XMLDesc(0) self._create_domain_and_network(xml, instance, network_info) @@ -967,7 +967,7 @@ class LibvirtDriver(driver.ComputeDriver): """ - virt_dom = self._conn.lookupByName(instance['name']) + virt_dom = self._lookup_by_name(instance['name']) unrescue_xml = virt_dom.XMLDesc(0) unrescue_xml_path = os.path.join(FLAGS.instances_path, instance['name'], @@ -994,7 +994,7 @@ class LibvirtDriver(driver.ComputeDriver): instance['name'], 'unrescue.xml') xml = libvirt_utils.load_file(unrescue_xml_path) - virt_dom = self._conn.lookupByName(instance['name']) + virt_dom = self._lookup_by_name(instance['name']) self._destroy(instance) self._create_domain(xml, virt_dom) libvirt_utils.file_delete(unrescue_xml_path) @@ -2339,7 +2339,7 @@ class LibvirtDriver(driver.ComputeDriver): flagvals = [getattr(libvirt, x.strip()) for x in flaglist] logical_sum = reduce(lambda x, y: x | y, flagvals) - dom = self._conn.lookupByName(instance_ref["name"]) + dom = self._lookup_by_name(instance_ref["name"]) dom.migrateToURI(FLAGS.live_migration_uri % dest, logical_sum, None, |