summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-02-24 13:01:16 -0600
committerJosh Kearney <josh@jk0.org>2011-02-24 13:01:16 -0600
commit9e018bbee1d4a308fdf1700bd25aa733cedc26e6 (patch)
tree68f7ed1ae09c8d581df092131935932eab6ddbdd /nova
parent7504531284be2d1fd6471f0ff3ef3b82a68ae469 (diff)
Updated email in Authors
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/xenapi/vmops.py20
1 files changed, 9 insertions, 11 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 7bffd8c6c..a47d23f88 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -476,19 +476,15 @@ class VMOps(object):
def rescue(self, instance, callback):
"""Rescue the specified instance"""
vm = self._get_vm_opaque_ref(instance)
-
self._shutdown(instance, vm)
+
+ # Temporary instance
target_vm = VMHelper.lookup(self._session, "instance-00000001")
- #target_vm = self.compute_api.create(
- # context=context.get_admin_context(),
- # instance_type="m1.tiny",
- # image_id=1,
- # kernel_id=3,
- # ramdisk_id=2,
- # display_name="test",
- # display_description="test")
- #print context.get_admin_context().__dict__
- #print target_vm
+
+ # Plan of action
+ # Create `instance` object for rescue_vm
+ # rescue_instance = self._make_rescue_instance() # Write this
+ #rescue_vm = self.spawn(instance)
vbd = self._session.get_xenapi().VM.get_VBDs(vm)[0]
vdi_ref = self._session.get_xenapi().VBD.get_record(vbd)["VDI"]
@@ -505,6 +501,8 @@ class VMOps(object):
def unrescue(self, instance, callback):
"""Unrescue the specified instance"""
vm = self._get_vm_opaque_ref(instance)
+
+ # Temporary instance
target_vm = VMHelper.lookup(self._session, "instance-00000001")
vbds = self._session.get_xenapi().VM.get_VBDs(target_vm)