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
This commit is contained in:
Thierry Carrez
parent
1827b2574b
commit
96c159a998
|
|
@ -1,146 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# pylint: disable=C0103
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2010 United States Government as represented by the
|
||||
# Administrator of the National Aeronautics and Space Administration.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
"""Ajax Console Proxy Server"""
|
||||
|
||||
from eventlet import greenthread
|
||||
from eventlet.green import urllib2
|
||||
|
||||
import exceptions
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import urlparse
|
||||
|
||||
# If ../nova/__init__.py exists, add ../ to Python search path, so that
|
||||
# it will override what happens to be installed in /usr/(local/)lib/python...
|
||||
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
||||
os.pardir,
|
||||
os.pardir))
|
||||
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
|
||||
sys.path.insert(0, possible_topdir)
|
||||
|
||||
|
||||
from nova import flags
|
||||
from nova import log as logging
|
||||
from nova.openstack.common import cfg
|
||||
from nova import rpc
|
||||
from nova import service
|
||||
from nova import utils
|
||||
from nova import wsgi
|
||||
|
||||
|
||||
ajax_console_idle_timeout_opt = \
|
||||
cfg.IntOpt('ajax_console_idle_timeout',
|
||||
default=300,
|
||||
help='Seconds before idle connection destroyed')
|
||||
|
||||
FLAGS = flags.FLAGS
|
||||
FLAGS.add_option(ajax_console_idle_timeout_opt)
|
||||
|
||||
LOG = logging.getLogger('nova.ajax_console_proxy')
|
||||
|
||||
|
||||
class AjaxConsoleProxy(object):
|
||||
tokens = {}
|
||||
|
||||
def __call__(self, env, start_response):
|
||||
try:
|
||||
if 'QUERY_STRING' in env:
|
||||
req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'],
|
||||
env['HTTP_HOST'],
|
||||
env['PATH_INFO'],
|
||||
env['QUERY_STRING'])
|
||||
else:
|
||||
req_url = '%s://%s%s' % (env['wsgi.url_scheme'],
|
||||
env['HTTP_HOST'],
|
||||
env['PATH_INFO'])
|
||||
|
||||
if 'HTTP_REFERER' in env:
|
||||
auth_url = env['HTTP_REFERER']
|
||||
else:
|
||||
auth_url = req_url
|
||||
|
||||
auth_params = urlparse.parse_qs(urlparse.urlparse(auth_url).query)
|
||||
parsed_url = urlparse.urlparse(req_url)
|
||||
|
||||
auth_info = AjaxConsoleProxy.tokens[auth_params['token'][0]]
|
||||
args = auth_info['args']
|
||||
auth_info['last_activity'] = time.time()
|
||||
|
||||
remote_url = ("http://%s:%s%s?token=%s" % (
|
||||
str(args['host']),
|
||||
str(args['port']),
|
||||
parsed_url.path,
|
||||
str(args['token'])))
|
||||
|
||||
opener = urllib2.urlopen(remote_url, env['wsgi.input'].read())
|
||||
body = opener.read()
|
||||
info = opener.info()
|
||||
|
||||
start_response("200 OK", info.dict.items())
|
||||
return body
|
||||
except (exceptions.KeyError):
|
||||
if env['PATH_INFO'] != '/favicon.ico':
|
||||
LOG.audit("Unauthorized request %s, %s"
|
||||
% (req_url, str(env)))
|
||||
start_response("401 NOT AUTHORIZED", [])
|
||||
return "Not Authorized"
|
||||
except Exception, exc:
|
||||
LOG.exception(exc)
|
||||
start_response("500 ERROR", [])
|
||||
return "Server Error"
|
||||
|
||||
def register_listeners(self):
|
||||
class TopicProxy():
|
||||
@staticmethod
|
||||
def authorize_ajax_console(context, **kwargs):
|
||||
AjaxConsoleProxy.tokens[kwargs['token']] = \
|
||||
{'args': kwargs, 'last_activity': time.time()}
|
||||
|
||||
self.conn = rpc.create_connection(new=True)
|
||||
self.conn.create_consumer(
|
||||
FLAGS.ajax_console_proxy_topic,
|
||||
TopicProxy)
|
||||
|
||||
def delete_expired_tokens():
|
||||
now = time.time()
|
||||
to_delete = []
|
||||
for k, v in AjaxConsoleProxy.tokens.items():
|
||||
if now - v['last_activity'] > FLAGS.ajax_console_idle_timeout:
|
||||
to_delete.append(k)
|
||||
|
||||
for k in to_delete:
|
||||
del AjaxConsoleProxy.tokens[k]
|
||||
|
||||
self.conn.consume_in_thread()
|
||||
utils.LoopingCall(delete_expired_tokens).start(1)
|
||||
|
||||
if __name__ == '__main__':
|
||||
utils.default_flagfile()
|
||||
FLAGS(sys.argv)
|
||||
logging.setup()
|
||||
acp_port = FLAGS.ajax_console_proxy_port
|
||||
acp = AjaxConsoleProxy()
|
||||
acp.register_listeners()
|
||||
server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
|
||||
service.serve(server)
|
||||
service.wait()
|
||||
acp.conn.close()
|
||||
|
|
@ -250,15 +250,6 @@ global_opts = [
|
|||
cfg.StrOpt('network_topic',
|
||||
default='network',
|
||||
help='the topic network nodes listen on'),
|
||||
cfg.StrOpt('ajax_console_proxy_topic',
|
||||
default='ajax_proxy',
|
||||
help='the topic ajax proxy nodes listen on'),
|
||||
cfg.StrOpt('ajax_console_proxy_url',
|
||||
default='http://127.0.0.1:8000',
|
||||
help='URL of ajax console proxy, in the form http://host:port'),
|
||||
cfg.IntOpt('ajax_console_proxy_port',
|
||||
default=8000,
|
||||
help='port that ajax_console_proxy binds'),
|
||||
cfg.StrOpt('vsa_topic',
|
||||
default='vsa',
|
||||
help='the topic that nova-vsa service listens on'),
|
||||
|
|
|
|||
|
|
@ -93,10 +93,6 @@ def get_open_port(start_port, end_port):
|
|||
return int((start_port + end_port) / 2)
|
||||
|
||||
|
||||
def run_ajaxterm(cmd, token, port):
|
||||
pass
|
||||
|
||||
|
||||
def get_fs_info(path):
|
||||
return {'total': 128 * (1024 ** 3),
|
||||
'used': 44 * (1024 ** 3),
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
"compute:lock": [],
|
||||
"compute:unlock": [],
|
||||
|
||||
"compute:get_ajax_console": [],
|
||||
"compute:get_vnc_console": [],
|
||||
"compute:get_console_output": [],
|
||||
|
||||
|
|
|
|||
|
|
@ -724,16 +724,6 @@ class ComputeTestCase(BaseTestCase):
|
|||
self.assertEqual(output, 'ANOTHER\nLAST LINE')
|
||||
self.compute.terminate_instance(self.context, instance['uuid'])
|
||||
|
||||
def test_ajax_console(self):
|
||||
"""Make sure we can get console output from instance"""
|
||||
instance = self._create_fake_instance()
|
||||
self.compute.run_instance(self.context, instance['uuid'])
|
||||
|
||||
console = self.compute.get_ajax_console(self.context,
|
||||
instance['uuid'])
|
||||
self.assert_(set(['token', 'host', 'port']).issubset(console.keys()))
|
||||
self.compute.terminate_instance(self.context, instance['uuid'])
|
||||
|
||||
def test_novnc_vnc_console(self):
|
||||
"""Make sure we can a vnc console for an instance."""
|
||||
instance = self._create_fake_instance()
|
||||
|
|
@ -2990,17 +2980,6 @@ class ComputeAPITestCase(BaseTestCase):
|
|||
'novnc')
|
||||
self.compute_api.delete(self.context, instance)
|
||||
|
||||
def test_ajax_console(self):
|
||||
"""Make sure we can an ajax console for an instance."""
|
||||
def ajax_rpc_call_wrapper(*args, **kwargs):
|
||||
return {'token': 'asdf', 'host': '0.0.0.0', 'port': 8080}
|
||||
|
||||
self.stubs.Set(rpc, 'call', ajax_rpc_call_wrapper)
|
||||
|
||||
instance = self._create_fake_instance()
|
||||
console = self.compute_api.get_ajax_console(self.context, instance)
|
||||
self.compute_api.delete(self.context, instance)
|
||||
|
||||
def test_console_output(self):
|
||||
instance = self._create_fake_instance()
|
||||
console = self.compute_api.get_console_output(self.context, instance)
|
||||
|
|
|
|||
|
|
@ -1925,20 +1925,6 @@ disk size: 4.4M''', ''))
|
|||
finally:
|
||||
os.unlink(dst_path)
|
||||
|
||||
def test_run_ajaxterm(self):
|
||||
self.mox.StubOutWithMock(utils, 'execute')
|
||||
token = 's3cr3tt0ken'
|
||||
shell_cmd = 'shell-cmd.py'
|
||||
port = 2048
|
||||
utils.execute(mox.IgnoreArg(),
|
||||
'--command', shell_cmd,
|
||||
'-t', token,
|
||||
'-p', port)
|
||||
|
||||
# Start test
|
||||
self.mox.ReplayAll()
|
||||
libvirt_utils.run_ajaxterm(shell_cmd, token, port)
|
||||
|
||||
def test_get_fs_info(self):
|
||||
# Use a 1024-byte block size (df -k) because OS X does not support
|
||||
# the -B flag
|
||||
|
|
|
|||
|
|
@ -288,14 +288,6 @@ class _VirtDriverTestCase(test.TestCase):
|
|||
console_output = self.connection.get_console_output(instance_ref)
|
||||
self.assertTrue(isinstance(console_output, basestring))
|
||||
|
||||
@catch_notimplementederror
|
||||
def test_get_ajax_console(self):
|
||||
instance_ref, network_info = self._get_running_instance()
|
||||
ajax_console = self.connection.get_ajax_console(instance_ref)
|
||||
self.assertIn('token', ajax_console)
|
||||
self.assertIn('host', ajax_console)
|
||||
self.assertIn('port', ajax_console)
|
||||
|
||||
@catch_notimplementederror
|
||||
def test_get_vnc_console(self):
|
||||
instance_ref, network_info = self._get_running_instance()
|
||||
|
|
|
|||
|
|
@ -259,6 +259,3 @@ class VMWareAPIVMTestCase(test.TestCase):
|
|||
|
||||
def test_get_console_output(self):
|
||||
pass
|
||||
|
||||
def test_get_ajax_console(self):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -94,8 +94,7 @@ function run_pep8 {
|
|||
# Opt-out files from pep8
|
||||
ignore_scripts="*.sh:*nova-debug:*clean-vlans"
|
||||
ignore_files="*eventlet-patch:*pip-requires"
|
||||
ignore_dirs="*ajaxterm*"
|
||||
GLOBIGNORE="$ignore_scripts:$ignore_files:$ignore_dirs"
|
||||
GLOBIGNORE="$ignore_scripts:$ignore_files"
|
||||
srcfiles=`find bin -type f ! -name "nova.conf*"`
|
||||
srcfiles+=" `find tools/*`"
|
||||
srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance"
|
||||
|
|
@ -124,8 +123,7 @@ function run_hacking {
|
|||
# Opt-out files from pep8
|
||||
ignore_scripts="*.sh:*nova-debug:*clean-vlans:*.swp"
|
||||
ignore_files="*eventlet-patch:*pip-requires"
|
||||
ignore_dirs="*ajaxterm*"
|
||||
GLOBIGNORE="$ignore_scripts:$ignore_files:$ignore_dirs"
|
||||
GLOBIGNORE="$ignore_scripts:$ignore_files"
|
||||
srcfiles=`find bin -type f ! -name "nova.conf*"`
|
||||
srcfiles+=" `find tools/*`"
|
||||
srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance"
|
||||
|
|
|
|||
Loading…
Reference in New Issue