Merge lp:~jk0/nova/lp702965 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Create and use a generic handler for RPC calls to compute.

[Matt Dietz (cerberus)]

Seems ok.

review: Approve

[Monsyne Dragon (mdragon)]

Lgtm. Just handling calls the same way as casts.

review: Approve

[Trey Morris (tr3buchet)]

/2nd

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-01-12 19:22:01 +0000
+++ nova/compute/api.py	2011-01-14 17:27:00 +0000
@@ -331,7 +331,7 @@
         return self.db.instance_get_all(context)
 
     def _cast_compute_message(self, method, context, instance_id, host=None):
-        """Generic handler for RPC calls to compute."""
+        """Generic handler for RPC casts to compute."""
         if not host:
             instance = self.get(context, instance_id)
             host = instance['host']
@@ -339,6 +339,15 @@
         kwargs = {'method': method, 'args': {'instance_id': instance_id}}
         rpc.cast(context, queue, kwargs)
 
+    def _call_compute_message(self, method, context, instance_id, host=None):
+        """Generic handler for RPC calls to compute."""
+        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}}
+        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)
@@ -357,7 +366,10 @@
 
     def get_diagnostics(self, context, instance_id):
         """Retrieve diagnostics for the given instance."""
-        self._cast_compute_message('get_diagnostics', context, instance_id)
+        return self._call_compute_message(
+            "get_diagnostics",
+            context,
+            instance_id)
 
     def get_actions(self, context, instance_id):
         """Retrieve actions for the given instance."""