From 71410724cd1516608ee58c37077bf9080da38de2 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Tue, 7 Feb 2012 16:37:34 +0100
Subject: Remove ajaxterm from Nova

Removes copy of ajaxterm code, nova-ajax-console-proxy,
and support for get_ajax_console from Nova proper.

Implements blueprint remove-ajaxterm
Fixes bug 917963

Change-Id: I2c0ff427c53c0f63a18b10475d6b4cbe9a085d83
---
 nova/compute/api.py     | 13 -------------
 nova/compute/manager.py |  9 ---------
 2 files changed, 22 deletions(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index f54d184dd..2f4d3e200 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1573,19 +1573,6 @@ class API(base.Base):
         self._cast_compute_message('inject_file', context,
                                    instance, params=params)
 
-    @wrap_check_policy
-    def get_ajax_console(self, context, instance):
-        """Get a url to an AJAX Console."""
-        output = self._call_compute_message('get_ajax_console',
-                                            context,
-                                            instance)
-        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'])}
-
     @wrap_check_policy
     def get_vnc_console(self, context, instance, console_type):
         """Get a url to an instance Console."""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index e5600af32..c7cd1baaf 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1551,15 +1551,6 @@ class ComputeManager(manager.SchedulerDependentManager):
         else:
             return '\n'.join(log.split('\n')[-int(length):])
 
-    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
-    @wrap_instance_fault
-    def get_ajax_console(self, context, instance_uuid):
-        """Return connection information for an ajax console."""
-        context = context.elevated()
-        LOG.debug(_("instance %s: getting ajax console"), instance_uuid)
-        instance_ref = self.db.instance_get_by_uuid(context, instance_uuid)
-        return self.driver.get_ajax_console(instance_ref)
-
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     @wrap_instance_fault
     def get_vnc_console(self, context, instance_uuid, console_type):
-- 
cgit