Merge from trunk

2 files changed, 38 insertions, 10 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 22d5964c6..ae760fd47 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -335,27 +335,55 @@ class API(base.Base):
             project_id)
         return self.db.instance_get_all(context)
 
-    def _cast_compute_message(self, method, context, instance_id, host=None):
-        """Generic handler for RPC casts to compute."""
+    def _cast_compute_message(self, method, context, instance_id, host=None,
+                              params=None):
+        """Generic handler for RPC casts to compute.
+
+        :param params: Optional dictionary of arguments to be passed to the
+                       compute worker
+
+        :retval None
+        """
+        if not params:
+            params = {}
         if not host:
             instance = self.get(context, instance_id)
             host = instance['host']
         queue = self.db.queue_get_for(context, FLAGS.compute_topic, host)
-        kwargs = {'method': method, 'args': {'instance_id': instance_id}}
+        params['instance_id'] = instance_id
+        kwargs = {'method': method, 'args': params}
         rpc.cast(context, queue, kwargs)
 
-    def _call_compute_message(self, method, context, instance_id, host=None):
-        """Generic handler for RPC calls to compute."""
+    def _call_compute_message(self, method, context, instance_id, host=None,
+                              params=None):
+        """Generic handler for RPC calls to compute.
+
+        :param params: Optional dictionary of arguments to be passed to the
+                       compute worker
+
+        :retval: Result returned by compute worker
+        """
+        if not params:
+            params = {}
         if not host:
             instance = self.get(context, instance_id)
             host = instance["host"]
         queue = self.db.queue_get_for(context, FLAGS.compute_topic, host)
-        kwargs = {"method": method, "args": {"instance_id": instance_id}}
+        params['instance_id'] = instance_id
+        kwargs = {'method': method, 'args': params}
         return rpc.call(context, queue, kwargs)
 
     def snapshot(self, context, instance_id, name):
-        """Snapshot the given instance."""
-        self._cast_compute_message('snapshot_instance', context, instance_id)
+        """Snapshot the given instance.
+
+        :retval: A dict containing image metadata
+        """
+        data = {'name': name, 'is_public': False}
+        image_meta = self.image_service.create(context, data)
+        params = {'image_id': image_meta['id']}
+        self._cast_compute_message('snapshot_instance', context, instance_id,
+                                   params=params)
+        return image_meta
 
     def reboot(self, context, instance_id):
         """Reboot the given instance."""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 714cec209..7f0641d44 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -294,7 +294,7 @@ class ComputeManager(manager.Manager):
         self._update_state(context, instance_id)
 
     @exception.wrap_exception
-    def snapshot_instance(self, context, instance_id, name):
+    def snapshot_instance(self, context, instance_id, image_id):
         """Snapshot an instance on this server."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
@@ -311,7 +311,7 @@ class ComputeManager(manager.Manager):
                        'instance: %s (state: %s excepted: %s)'),
                      instance_id, instance_ref['state'], power_state.RUNNING)
 
-        self.driver.snapshot(instance_ref, name)
+        self.driver.snapshot(instance_ref, image_id)
 
     @exception.wrap_exception
     @checks_instance_lock