diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-22 22:50:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-22 22:50:47 +0000 |
| commit | 8fcd4141816fdcec6bea94aa6190ec065c6cbd9f (patch) | |
| tree | 8c8e886b9f268d2b32759ad43b4a16cf0b8b09ef /nova/tests | |
| parent | c8a13fd27d699de5673b571dfe2eabf94097216c (diff) | |
| parent | b4dc932c2a10c3d9c678cf759f94237504661348 (diff) | |
Merge "Can now reboot rescued instances in xenapi"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 474fd1eb9..9919fc138 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -1103,6 +1103,20 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): self.assertRaises(xenapi_fake.Failure, conn.reboot, self.context, instance, None, "SOFT") + def test_reboot_rescued(self): + instance = self._create_instance() + instance['vm_state'] = vm_states.RESCUED + conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False) + + real_result = vm_utils.lookup(conn._session, instance['name']) + + self.mox.StubOutWithMock(vm_utils, 'lookup') + vm_utils.lookup(conn._session, instance['name'], + True).AndReturn(real_result) + self.mox.ReplayAll() + + conn.reboot(self.context, instance, None, "SOFT") + def _test_maintenance_mode(self, find_host, find_aggregate): real_call_xenapi = self.conn._session.call_xenapi instance = self._create_instance(spawn=True) |