x/gantt
Code Issues Proposed changes

Merged with trunk

Browse Source 
Updated net injection for xenapi reflecting recent changes for libvirt
This commit is contained in:
Salvatore Orlando
2011-03-25 00:16:53 +00:00
parent c2f85f734f 261d82dec3
commit 50aa80b2a4
21 changed files with 790 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/tests/test_xenapi.py
View File

@@ -195,6 +195,7 @@ class XenAPIVMTestCase(test.TestCase):
stubs.stubout_stream_disk(self.stubs)
stubs.stubout_is_vdi_pv(self.stubs)
self.stubs.Set(VMOps, 'reset_network', reset_network)
stubs.stub_out_vm_methods(self.stubs)
glance_stubs.stubout_glance_client(self.stubs,
glance_stubs.FakeGlance)
fake_utils.stub_out_utils_execute(self.stubs)
@@ -475,6 +476,18 @@ class XenAPIVMTestCase(test.TestCase):
self.assertEquals(vif_rec['qos_algorithm_params']['kbps'],
str(4 * 1024))
def test_rescue(self):
self.flags(xenapi_inject_image=False)
instance = self._create_instance()
conn = xenapi_conn.get_connection(False)
conn.rescue(instance, None)
def test_unrescue(self):
instance = self._create_instance()
conn = xenapi_conn.get_connection(False)
# Ensure that it will not unrescue a non-rescued instance.
self.assertRaises(Exception, conn.unrescue, instance, None)
def tearDown(self):
super(XenAPIVMTestCase, self).tearDown()
self.manager.delete_project(self.project)