add in support of openstack api

2 files changed, 10 insertions, 22 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index b3aa83398..11853c8db 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -452,30 +452,9 @@ class CloudController(object):
                 "output": base64.b64encode(output)}
 
     def get_ajax_console(self, context, instance_id, **kwargs):
-        """Get an AJAX Console
-
-        In order for this to work properly, a ttyS0 must be configured
-        in the instance
-        """
-
         ec2_id = instance_id[0]
         internal_id = ec2_id_to_internal_id(ec2_id)
-        instance_ref = db.instance_get_by_internal_id(context, internal_id)
-
-        output = rpc.call(context,
-                          '%s.%s' % (FLAGS.compute_topic,
-                                     instance_ref['host']),
-                          {'method': 'get_ajax_console',
-                           'args': {'instance_id': instance_ref['id']}})
-
-        # TODO: make this a call
-        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'])}
+        return self.compute_api.get_ajax_console(context, internal_id)
 
     def describe_volumes(self, context, volume_id=None, **kwargs):
         if context.user.is_admin():
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 5c3322f7c..45db89cbf 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,3 +195,12 @@ class Controller(wsgi.Controller):
             logging.error("Compute.api::unpause %s", readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
+
+    def get_ajax_console(self, req, id):
+        """ Returns a url to and ajaxterm instance console. """
+        try:
+            self.compute_api.get_ajax_console(req.environ['nova.context'],
+                int(id))
+        except exception.NotFound:
+            return faults.Fault(exc.HTTPNotFound())
+        return exc.HTTPAccepted()