merged to trunk rev781

2011-03-10 15:23:13 +09:00
parent 12036e81ac 8c630245a7
commit 2dff2afd7e
13 changed files with 333 additions and 81 deletions
--- a/nova/tests/test_volume.py
+++ b/nova/tests/test_volume.py
@@ -101,7 +101,7 @@ class VolumeTestCase(test.TestCase):
    def test_run_attach_detach_volume(self):
        """Make sure volume can be attached and detached from instance."""
        inst = {}
-        inst['image_id'] = 'ami-test'
+        inst['image_id'] = 1
        inst['reservation_id'] = 'r-fakeres'
        inst['launch_time'] = '10'
        inst['user_id'] = 'fake'