From c184fa5d03f3f8d7faaff7b583404874de409aa6 Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok@nttdata.co.jp>
Date: Tue, 21 Jun 2011 20:51:07 +0900
Subject: fixed reviewer's comment. 1. adding dest-instance-dir deleting
 operation to nova.compute.manager, 2. fix invalid raise statement

---
 nova/tests/test_compute.py | 17 +++++++++++++----
 nova/tests/test_libvirt.py |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 840961771..e9f5eb0e8 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -556,7 +556,10 @@ class ComputeTestCase(test.TestCase):
         dbmock.queue_get_for(c, FLAGS.compute_topic, i_ref['host']).\
                              AndReturn(topic)
         rpc.call(c, topic, {"method": "pre_live_migration",
-                            "args": {'instance_id': i_ref['id']}})
+                            "args": {'instance_id': i_ref['id'],
+                                     'block_migration': False,
+                                     'disk': None}})
+
         self.mox.StubOutWithMock(self.compute.driver, 'live_migration')
         self.compute.driver.live_migration(c, i_ref, i_ref['host'],
                                   self.compute.post_live_migration,
@@ -582,7 +585,9 @@ class ComputeTestCase(test.TestCase):
         dbmock.queue_get_for(c, FLAGS.compute_topic, i_ref['host']).\
                              AndReturn(topic)
         rpc.call(c, topic, {"method": "pre_live_migration",
-                            "args": {'instance_id': i_ref['id']}}).\
+                            "args": {'instance_id': i_ref['id'],
+                                     'block_migration': False,
+                                     'disk': None}}).\
                             AndRaise(rpc.RemoteError('', '', ''))
         dbmock.instance_update(c, i_ref['id'], {'state_description': 'running',
                                                 'state': power_state.RUNNING,
@@ -609,7 +614,9 @@ class ComputeTestCase(test.TestCase):
                              AndReturn(topic)
         self.mox.StubOutWithMock(rpc, 'call')
         rpc.call(c, topic, {"method": "pre_live_migration",
-                            "args": {'instance_id': i_ref['id']}}).\
+                            "args": {'instance_id': i_ref['id'],
+                                     'block_migration': False,
+                                     'disk': None}}).\
                             AndRaise(rpc.RemoteError('', '', ''))
         dbmock.instance_update(c, i_ref['id'], {'state_description': 'running',
                                                 'state': power_state.RUNNING,
@@ -634,7 +641,9 @@ class ComputeTestCase(test.TestCase):
         dbmock.queue_get_for(c, FLAGS.compute_topic, i_ref['host']).\
                              AndReturn(topic)
         rpc.call(c, topic, {"method": "pre_live_migration",
-                            "args": {'instance_id': i_ref['id']}})
+                            "args": {'instance_id': i_ref['id'],
+                                     'block_migration': False,
+                                     'disk': None}})
         self.mox.StubOutWithMock(self.compute.driver, 'live_migration')
         self.compute.driver.live_migration(c, i_ref, i_ref['host'],
                                   self.compute.post_live_migration,
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 79a2b84b7..2e57dae08 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -734,7 +734,7 @@ class LibvirtConnTestCase(test.TestCase):
         # large disk space.
         self.mox.StubOutWithMock(utils, "execute")
         utils.execute('sudo', 'qemu-img', 'create', '-f', 'raw',
-                      '%s/%s/disk' % (tmpdir, instance_ref.name), 10)
+                      '%s/%s/disk' % (tmpdir, instance_ref.name), '10G')
 
         self.mox.ReplayAll()
         conn = connection.LibvirtConnection(False)
@@ -759,10 +759,10 @@ class LibvirtConnTestCase(test.TestCase):
         instance_ref = db.instance_create(self.context, self.test_instance)
         dummyxml = ("<domain type='kvm'><name>instance-0000000a</name>"
                     "<devices>"
-                    "<disk type='file'><driver type='raw'/>"
+                    "<disk type='file'><driver name='qemu' type='raw'/>"
                     "<source file='/test/disk'/>"
                     "<target dev='vda' bus='virtio'/></disk>"
-                    "<disk type='file'><driver type='qcow2'/>"
+                    "<disk type='file'><driver name='qemu' type='qcow2'/>"
                     "<source file='/test/disk.local'/>"
                     "<target dev='vdb' bus='virtio'/></disk>"
                     "</devices></domain>")
-- 
cgit