summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-03-23 14:55:33 -0500
committerJosh Kearney <josh@jk0.org>2011-03-23 14:55:33 -0500
commita291e68fef876080d7984a1d7192e939808596bf (patch)
tree6fe23f746e39fa7765ab5b6d24e4123186c909de
parent2d267a00b40d6ecd99a89926f7d7f84b03efb226 (diff)
Fixed some typos
-rw-r--r--nova/virt/xenapi/vmops.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index cb36730a0..0a516bd36 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -463,7 +463,7 @@ class VMOps(object):
except self.XenAPI.Failure, exc:
LOG.exception(exc)
- def _shutdown_rescue(self, vm_ref):
+ def _shutdown_rescue(self, rescue_vm_ref):
"""Shutdown a rescue instance"""
self._session.call_xenapi("Async.VM.hard_shutdown", rescue_vm_ref)
@@ -552,7 +552,7 @@ class VMOps(object):
LOG.debug(_("Instance %(instance_id)s VM destroyed") % locals())
- def _destroy_rescue(self, vm_ref):
+ def _destroy_rescue_instance(self, rescue_vm_ref):
"""Destroy a rescue instance"""
self._session.call_xenapi("Async.VM.destroy", rescue_vm_ref)
@@ -671,7 +671,7 @@ class VMOps(object):
self._destroy_rescue_vbds(rescue_vm_ref)
self._shutdown_rescue(rescue_vm_ref)
self._destroy_rescue_vdis(rescue_vm_ref)
- self._destroy_rescue(rescue_vm_ref)
+ self._destroy_rescue_instance(rescue_vm_ref)
self._release_bootlock(original_vm_ref)
self._start(instance, original_vm_ref)
@@ -709,7 +709,7 @@ class VMOps(object):
self._destroy_rescue_vbds(rescue_vm_ref)
self._shutdown_rescue(rescue_vm_ref)
self._destroy_rescue_vdis(rescue_vm_ref)
- self._destroy_rescue(rescue_vm_ref)
+ self._destroy_rescue_instance(rescue_vm_ref)
self._release_bootlock(original_vm_ref)
self._session.call_xenapi("VM.start", original_vm_ref, False,
False)