Merge "Fixing immediate delete after boot on Libvirt"

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2011年11月03日 19:55:18 +00:00

committed by Gerrit Code Review

parent 907f219b6a 4cda8f7068

commit fec3c19c49

2 changed files with 24 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

12
nova/tests/test_libvirt.py

View File

@@ -1075,6 +1075,18 @@ class LibvirtConnTestCase(test.TestCase):

compute_driver = driver.ComputeDriver()

self.assertRaises(NotImplementedError, compute_driver.reboot, *args)

def test_immediate_delete(self):

# Skip if non-libvirt environment

if not self.lazy_load_library_exists():

return

conn = connection.LibvirtConnection(False)

self.mox.StubOutWithMock(connection.LibvirtConnection, '_conn')

connection.LibvirtConnection._conn.lookupByName = lambda x: None

instance = db.instance_create(self.context, self.test_instance)

conn.destroy(instance, {})

class NWFilterFakes:

def __init__(self):

24
nova/virt/libvirt/connection.py

View File

@@ -304,18 +304,18 @@ class LibvirtConnection(driver.ComputeDriver):

locals())

raise

try:

# NOTE(justinsb): We remove the domain definition. We probably

# would do better to keep it if cleanup=False (e.g. volumes?)

# (e.g. #2 - not losing machines on failure)

virt_dom.undefine()

except libvirt.libvirtError as e:

errcode = e.get_error_code()

LOG.warning(_("Error from libvirt during undefine of "

"%(instance_name)s. Code=%(errcode)s"

"Error=%(e)s") %

locals())

raise

try:

# NOTE(justinsb): We remove the domain definition. We probably

# would do better to keep it if cleanup=False (e.g. volumes?)

# (e.g. #2 - not losing machines on failure)

virt_dom.undefine()

except libvirt.libvirtError as e:

errcode = e.get_error_code()

LOG.warning(_("Error from libvirt during undefine of "

"%(instance_name)s. Code=%(errcode)s"

"Error=%(e)s") %

locals())

raise

for (network, mapping) in network_info:

self.vif_driver.unplug(instance, network, mapping)