x/python-ganttclient
Code Issues Proposed changes

Refactor libvirt create calls

Browse Source 
* minimizes duplicated code for create
 * makes wait_for_destroy happen on shutdown instead of undefine
 * allows for destruction of an instance while leaving the domain
 * uses reset for hard reboot instead of create/destroy
 * makes resume_host_state use new methods instead of hard_reboot
 * makes rescue/unrescue not use hard reboot to recreate domain

Change-Id: I2072f93ad6c889d534b04009671147af653048e7
This commit is contained in:
Vishvananda Ishaya
2012-06-01 01:44:02 +00:00
parent 1579aa2aac
commit cc3b912d76
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/fakelibvirt.py
View File

@@ -288,6 +288,11 @@ class Domain(object):
self._state = VIR_DOMAIN_SHUTDOWN
self._connection._mark_not_running(self)
def reset(self, flags):
# FIXME: Not handling flags at the moment
self._state = VIR_DOMAIN_RUNNING
self._connection._mark_running(self)
def info(self):
return [self._state,
long(self._def['memory']),

26
nova/tests/test_libvirt.py
View File

@@ -2496,7 +2496,7 @@ class LibvirtDriverTestCase(test.TestCase):
def fake_get_instance_disk_info(instance):
return '[]'
def fake_destroy(instance, network_info, cleanup=True):
def fake_destroy(instance):
pass
def fake_get_host_ip_addr():
@@ -2541,7 +2541,7 @@ class LibvirtDriverTestCase(test.TestCase):
def fake_get_instance_disk_info(instance):
return disk_info_text
def fake_destroy(instance, network_info, cleanup=True):
def fake_destroy(instance):
pass
def fake_get_host_ip_addr():
@@ -2623,9 +2623,12 @@ class LibvirtDriverTestCase(test.TestCase):
block_device_info=None):
pass
def fake_create_new_domain(xml):
def fake_create_domain(xml):
return None
def fake_enable_hairpin(instance):
pass
def fake_execute(*args, **kwargs):
pass
@@ -2635,8 +2638,10 @@ class LibvirtDriverTestCase(test.TestCase):
self.stubs.Set(self.libvirtconnection, 'plug_vifs', fake_plug_vifs)
self.stubs.Set(self.libvirtconnection, '_create_image',
fake_create_image)
self.stubs.Set(self.libvirtconnection, '_create_new_domain',
fake_create_new_domain)
self.stubs.Set(self.libvirtconnection, '_create_domain',
fake_create_domain)
self.stubs.Set(self.libvirtconnection, '_enable_hairpin',
fake_enable_hairpin)
self.stubs.Set(utils, 'execute', fake_execute)
fw = base_firewall.NoopFirewallDriver()
self.stubs.Set(self.libvirtconnection, 'firewall_driver', fw)
@@ -2658,15 +2663,20 @@ class LibvirtDriverTestCase(test.TestCase):
def fake_plug_vifs(instance, network_info):
pass
def fake_create_new_domain(xml):
def fake_create_domain(xml):
return None
def fake_enable_hairpin(instance):
pass
self.stubs.Set(self.libvirtconnection, 'plug_vifs', fake_plug_vifs)
self.stubs.Set(utils, 'execute', fake_execute)
fw = base_firewall.NoopFirewallDriver()
self.stubs.Set(self.libvirtconnection, 'firewall_driver', fw)
self.stubs.Set(self.libvirtconnection, '_create_new_domain',
fake_create_new_domain)
self.stubs.Set(self.libvirtconnection, '_create_domain',
fake_create_domain)
self.stubs.Set(self.libvirtconnection, '_enable_hairpin',
fake_enable_hairpin)
with utils.tempdir() as tmpdir:
self.flags(instances_path=tmpdir)