From 76e875476848ee7f4aa483f65484903115e2bb49 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 14 Jan 2011 10:25:44 -0800
Subject: import re, remove extra call in cloud.py.  Move get_console_output to
 compute_api

---
 nova/compute/api.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 90273da36..e6cfa459e 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -21,6 +21,7 @@ Handles all requests relating to instances (guest vms).
 """
 
 import datetime
+import re
 import time
 
 from nova import db
@@ -385,23 +386,23 @@ class API(base.Base):
 
     def get_ajax_console(self, context, instance_id):
         """Get a url to an AJAX Console"""
-
         instance = self.get(context, instance_id)
-
-        output = rpc.call(context,
-                          '%s.%s' % (FLAGS.compute_topic,
-                                     instance['host']),
-                          {'method': 'get_ajax_console',
-                           'args': {'instance_id': instance['id']}})
-
+        output = self._call_compute_message('get_ajax_console',
+                                            context,
+                                            instance_id)
         rpc.cast(context, '%s' % FLAGS.ajax_console_proxy_topic,
                  {'method': 'authorize_ajax_console',
                   'args': {'token': output['token'], 'host': output['host'],
                   'port': output['port']}})
-
         return {'url': '%s?token=%s' % (FLAGS.ajax_console_proxy_url,
                 output['token'])}
 
+    def get_console_output(self, context, instance_id):
+        """Get console output for an an instance"""
+        return self._call_compute_message('get_console_output',
+                                          context,
+                                          instance_id)
+
     def lock(self, context, instance_id):
         """lock the instance with instance_id"""
         self._cast_compute_message('lock_instance', context, instance_id)
-- 
cgit