summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-17 23:09:06 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-17 23:09:06 -0600
commit4b51ec3e9bca7421c66816c77c43396e51e68ea6 (patch)
treec96aae0accec4be79c2ec4c098e366a20862778a /nova/virt
parent88aa545b53d96c25da01218c79e8be8c1ae3370f (diff)
Tests
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/fake.py13
-rw-r--r--nova/virt/xenapi_conn.py8
2 files changed, 13 insertions, 8 deletions
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index ff5e22603..da86df6d4 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -176,6 +176,19 @@ class FakeConnection(object):
"""
pass
+ def migrate_disk_and_power_off(self, instance, dest):
+ """
+ Transfers the disk of a running instance in multiple phases, turning
+ off the instance before the end.
+ """
+ pass
+
+ def attach_disk(self, instance, disk_info):
+ """
+ Attaches the disk to an instance given the metadata disk_info
+ """
+ pass
+
def pause(self, instance, callback):
"""
Pause the specified instance.
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index aafd836e2..be018b47f 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -184,14 +184,6 @@ class XenAPIConnection(object):
"""Unpause paused VM instance"""
self._vmops.unpause(instance, callback)
- def power_off(self, instance):
- """Shuts down a running VM instance"""
- self._vmops._shutdown(instance, method='clean')
-
- def power_on(self, instance):
- """powers on a powered off VM instance"""
- self._vmops.power_on(instance)
-
def migrate_disk_and_power_off(self, instance, dest):
"""Transfers the VHD of a running instance to another host, then shuts
off the instance copies over the COW disk"""