Tests

4 files changed, 25 insertions, 11 deletions

diff --git a/nova/tests/api/openstack/common.py b/nova/tests/api/openstack/common.py
index b55d3087b..66207cddc 100644
--- a/nova/tests/api/openstack/common.py
+++ b/nova/tests/api/openstack/common.py
@@ -21,10 +21,12 @@ import webob
 
 def webob_factory(url):
     base_url = url
-    def web_request(url, method, body=None):
+    def web_request(url, method=None, body=None):
         req = webob.Request.blank("%s%s" % (base_url, url)) 
-        req.method = method
-        req.body = json.dumps(body)
+        if method:
+            req.method = method
+        if body:
+            req.body = json.dumps(body)
         return req
     return web_request
     
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 2aa0690e7..e27e08827 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -258,3 +258,10 @@ class ComputeTestCase(test.TestCase):
         self.assertEqual(ret_val, None)
 
         self.compute.terminate_instance(self.context, instance_id)
+
+    def test_resize_instance(self):
+        """Ensure instance can be migrated/resized"""
+        instance_id = self._create_instance()
+        self.compute.run_instnce(self.context, instance_id)
+        self.compute.prep_resize(self.context, instance_id)
+
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"""