Merge lp:~termie/nova/fix_snapshot into lp:~hudson-openstack/nova/trunk

[termie]

The change to utils.execute's call style missed this call somehow, this should get libvirt snapshots working again.

[lp:~termie/nova/fix_snapshot]

989. By Thierry Carrez on 2011-04-15

Final versioning for Cactus

990. By Thierry Carrez on 2011-04-15

Diablo versioning.

991. By Josh Kearney on 2011-04-15

Only poll for instance states that compute should care about.

992. By Josh Kearney on 2011-04-15

Removed the unused self.interfaces_xml variable.

[Brian Lamar (blamar)]

Related bug https://bugs.launchpad.net/nova/+bug/750544

review: Approve

[Vish Ishaya (vishvananda)]

looks like there is one other error with snapshotting. The name field shouldn't be in the properties dict, but move up one level into the main metadata dict.

review: Needs Fixing

[lp:~termie/nova/fix_snapshot]

993. By Brian Lamar on 2011-04-16

Add additional logging for WSGI and OpenStack API authentication.

994. By termie on 2011-04-17

change libvirt snapshot to new style execute

995. By termie on 2011-04-17

move name into main metadata instead of properties

[termie (termie)]

upgedated

[Vish Ishaya (vishvananda)]

Awesome. Lgtm

review: Approve

[Jesse Andrews (anotherjesse)]

LGTM

review: Approve

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-04-15 15:58:28 +0000
+++ nova/virt/libvirt_conn.py	2011-04-17 03:27:27 +0000
@@ -58,7 +58,6 @@
 from nova import exception
 from nova import flags
 from nova import log as logging
-#from nova import test
 from nova import utils
 from nova import vnc
 from nova.auth import manager
@@ -471,8 +470,8 @@
         metadata = {'disk_format': base['disk_format'],
                     'container_format': base['container_format'],
                     'is_public': False,
+                    'name': '%s.%s' % (base['name'], image_id),
                     'properties': {'architecture': base['architecture'],
-                                   'name': '%s.%s' % (base['name'], image_id),
                                    'kernel_id': instance['kernel_id'],
                                    'image_location': 'snapshot',
                                    'image_state': 'available',
@@ -499,12 +498,17 @@
         # Export the snapshot to a raw image
         temp_dir = tempfile.mkdtemp()
         out_path = os.path.join(temp_dir, snapshot_name)
-        qemu_img_cmd = '%s convert -f qcow2 -O raw -s %s %s %s' % (
-                FLAGS.qemu_img,
-                snapshot_name,
-                disk_path,
-                out_path)
-        utils.execute(qemu_img_cmd)
+        qemu_img_cmd = (FLAGS.qemu_img,
+                        'convert',
+                        '-f',
+                        'qcow2',
+                        '-O',
+                        'raw',
+                        '-s',
+                        snapshot_name,
+                        disk_path,
+                        out_path)
+        utils.execute(*qemu_img_cmd)
 
         # Upload that image to the image service
         with open(out_path) as image_file: