Merge lp:~frankban/charms/precise/juju-gui/guiserver-bundles-integration into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

GUI server: bundles support integration.

This branch enables the GUI server bundles support.
Changed the hooks so that the new GUI server
dependencies are installed.
Also added more info to the info handler.

Tests: `make unittest` from the branch root.

QA:

In the steps below I assume your default juju is
juju-core and your juju-core env is named "go".

- Bootstrap a juju-core environment:

  juju bootstrap -e go --upload-tools

- From the root of this branch, deploy and expose
  the GUI running the following:

  make deploy JUJU_ENV=go

  The command above will exit when the GUI is ready.

- Switch to the GUI server, then wait a minute for the
  server to be ready:

  juju set -e go juju-gui builtin-server=true

- In a separate terminal tab, start watching the GUI server log
  (the first line should be "starting Juju GUI server v0.1.0"):

  juju ssh -e go 1 sudo tailf /var/log/upstart/guiserver.log

- Use the browser to navigate the GUI, log in and check
  everything works fine.

- Also visit the /gui-server-info URL path: you should see
  something like:
  {
    "uptime": 77,
    "deployer": [],
    "apiversion": "go",
    "version": "0.1.0",
    "debug": false,
    "apiurl": "wss://ec2-54-211-156-178.compute-1.amazonaws.com:17070"
  }

- Let's live test the deployer support: to do that, we will
  use the script in http://pastebin.ubuntu.com/6028073/

- Download the script, edit the PASSWORD value (line 17) and
  execute it passing the Juju GUI node address as first argument, e.g.:

    python start-deployer.py ec2-54-227-188-14.compute-1.amazonaws.com

- The script runs several API calls, simulates errors
  in the API parameters (which should also be notified in the GUI
  server logs), starts two deployments and start watching the
  second one. It takes some minutes to complete. In the meanwhile,
  you should be able to see the relevant changes in the topology view.
  At the end of the process, the GUI should show three started
  services (wordpress and mysql, connected to each other, and
  mediawiki), and the output of the script should be similar to
  this one: http://pastebin.ubuntu.com/6028121/

  Note that I added a card to create a charm functional test that
  automates this live check.

- Switch back to the legacy server (haproxy + apaxche2):

  juju set -e go juju-gui builtin-server=false

- Refresh the browser and check everything is ok.

Done, thank you!

https://codereview.appspot.com/12741051/

[Francesco Banconi (frankban)]

Reviewers: mp+182067_code.launchpad.net,

Message:
Please take a look.

Description:
GUI server: bundles support integration.

This branch enables the GUI server bundles support.
Changed the hooks so that the new GUI server
dependencies are installed.
Also added more info to the info handler.

Tests: `make unittest` from the branch root.

QA:

In the steps below I assume your default juju is
juju-core and your juju-core env is named "go".

- Bootstrap a juju-core environment:

   juju bootstrap -e go --upload-tools

- From the root of this branch, deploy and expose
   the GUI running the following:

   make deploy JUJU_ENV=go

   The command above will exit when the GUI is ready.

- Switch to the GUI server, then wait a minute for the
   server to be ready:

   juju set -e go juju-gui builtin-server=true

- In a separate terminal tab, start watching the GUI server log
   (the first line should be "starting Juju GUI server v0.1.0"):

   juju ssh -e go 1 sudo tailf /var/log/upstart/guiserver.log

- Use the browser to navigate the GUI, log in and check
   everything works fine.

- Also visit the /gui-server-info URL path: you should see
   something like:
   {
     "uptime": 77,
     "deployer": [],
     "apiversion": "go",
     "version": "0.1.0",
     "debug": false,
     "apiurl": "wss://ec2-54-211-156-178.compute-1.amazonaws.com:17070"
   }

- Let's live test the deployer support: to do that, we will
   use the script in http://pastebin.ubuntu.com/6028073/

- Download the script, edit the PASSWORD value (line 17) and
   execute it passing the Juju GUI node address as first argument, e.g.:

     python start-deployer.py ec2-54-227-188-14.compute-1.amazonaws.com

- The script runs several API calls, simulates errors
   in the API parameters (which should also be notified in the GUI
   server logs), starts two deployments and start watching the
   second one. It takes some minutes to complete. In the meanwhile,
   you should be able to see the relevant changes in the topology view.
   At the end of the process, the GUI should show three started
   services (wordpress and mysql, connected to each other, and
   mediawiki), and the output of the script should be similar to
   this one: http://pastebin.ubuntu.com/6028121/

   Note that I added a card to create a charm functional test that
   automates this live check.

- Switch back to the legacy server (haproxy + apaxche2):

   juju set -e go juju-gui builtin-server=false

- Refresh the browser and check everything is ok.

Done, thank you!

https://code.launchpad.net/~frankban/charms/precise/juju-gui/guiserver-bundles-integration/+merge/182067

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/12741051/

Affected files:
   A [revision details]
   A deps/futures-2.1.4.tar.gz
   A deps/juju-deployer-0.2.2.tar.gz
   A deps/jujuclient-0.0.9.tar.gz
   M hooks/backend.py
   M hooks/utils.py
   M revision
   M server/guiserver/__init__.py
   M server/guiserver/apps.py
   M server/guiserver/handlers.py
   M server/guiserver/tests/helpers.py
   M server/guiserver/tests/test_apps.py
   M server/guiserver/tests/test_handlers.py
   M server/guiserver/tests/...

[Brad Crittenden (bac)]

Code LGTM and the QA worked perfectly.

Thanks for the detailed QA instructions.

https://codereview.appspot.com/12741051/diff/1/server/guiserver/utils.py
File server/guiserver/utils.py (right):

https://codereview.appspot.com/12741051/diff/1/server/guiserver/utils.py#newcode101
server/guiserver/utils.py:101: handler_ref = weakref.ref(handler)
Interesting!

https://codereview.appspot.com/12741051/

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/12741051/

[Francesco Banconi (frankban)]

*** Submitted:

GUI server: bundles support integration.

This branch enables the GUI server bundles support.
Changed the hooks so that the new GUI server
dependencies are installed.
Also added more info to the info handler.

Tests: `make unittest` from the branch root.

QA:

In the steps below I assume your default juju is
juju-core and your juju-core env is named "go".

- Bootstrap a juju-core environment:

   juju bootstrap -e go --upload-tools

- From the root of this branch, deploy and expose
   the GUI running the following:

   make deploy JUJU_ENV=go

   The command above will exit when the GUI is ready.

- Switch to the GUI server, then wait a minute for the
   server to be ready:

   juju set -e go juju-gui builtin-server=true

- In a separate terminal tab, start watching the GUI server log
   (the first line should be "starting Juju GUI server v0.1.0"):

   juju ssh -e go 1 sudo tailf /var/log/upstart/guiserver.log

- Use the browser to navigate the GUI, log in and check
   everything works fine.

- Also visit the /gui-server-info URL path: you should see
   something like:
   {
     "uptime": 77,
     "deployer": [],
     "apiversion": "go",
     "version": "0.1.0",
     "debug": false,
     "apiurl": "wss://ec2-54-211-156-178.compute-1.amazonaws.com:17070"
   }

- Let's live test the deployer support: to do that, we will
   use the script in http://pastebin.ubuntu.com/6028073/

- Download the script, edit the PASSWORD value (line 17) and
   execute it passing the Juju GUI node address as first argument, e.g.:

     python start-deployer.py ec2-54-227-188-14.compute-1.amazonaws.com

- The script runs several API calls, simulates errors
   in the API parameters (which should also be notified in the GUI
   server logs), starts two deployments and start watching the
   second one. It takes some minutes to complete. In the meanwhile,
   you should be able to see the relevant changes in the topology view.
   At the end of the process, the GUI should show three started
   services (wordpress and mysql, connected to each other, and
   mediawiki), and the output of the script should be similar to
   this one: http://pastebin.ubuntu.com/6028121/

   Note that I added a card to create a charm functional test that
   automates this live check.

- Switch back to the legacy server (haproxy + apaxche2):

   juju set -e go juju-gui builtin-server=false

- Refresh the browser and check everything is ok.

Done, thank you!

R=bac, rharding
CC=
https://codereview.appspot.com/12741051

https://codereview.appspot.com/12741051/

[Francesco Banconi (frankban)]

Thanks Brad and Rick for the reviews!

https://codereview.appspot.com/12741051/

=== added file 'deps/futures-2.1.4.tar.gz'
Binary files deps/futures-2.1.4.tar.gz	1970-01-01 00:00:00 +0000 and deps/futures-2.1.4.tar.gz	2013-08-26 10:30:37 +0000 differ
=== added file 'deps/juju-deployer-0.2.2.tar.gz'
Binary files deps/juju-deployer-0.2.2.tar.gz	1970-01-01 00:00:00 +0000 and deps/juju-deployer-0.2.2.tar.gz	2013-08-26 10:30:37 +0000 differ
=== added file 'deps/jujuclient-0.0.9.tar.gz'
Binary files deps/jujuclient-0.0.9.tar.gz	1970-01-01 00:00:00 +0000 and deps/jujuclient-0.0.9.tar.gz	2013-08-26 10:30:37 +0000 differ
=== modified file 'hooks/backend.py'
--- hooks/backend.py	2013-08-08 13:53:22 +0000
+++ hooks/backend.py	2013-08-26 10:30:37 +0000
@@ -183,10 +183,11 @@
 class BuiltinServerMixin(ServerInstallMixinBase):
     """Manage the builtin server via Upstart."""
 
-    debs = ('openssl', 'python-pip')
+    # The package python-bzrlib is required by juju-deployer.
+    # The package python-pip is is used to install the GUI server dependencies.
+    debs = ('openssl', 'python-bzrlib', 'python-pip')
 
     def install(self, backend):
-        utils.install_tornado()
         utils.install_builtin_server()
         self._setup_certificates(backend)
 

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2013-08-09 13:41:19 +0000
+++ hooks/utils.py	2013-08-26 10:30:37 +0000
@@ -107,8 +107,14 @@
 CONFIG_DIR = os.path.join(CURRENT_DIR, 'config')
 JUJU_DIR = os.path.join(CURRENT_DIR, 'juju')
 JUJU_GUI_DIR = os.path.join(CURRENT_DIR, 'juju-gui')
+# Builtin server dependencies. The order of these requirements is important.
+SERVER_DEPENDENCIES = (
+    'futures-2.1.4.tar.gz',
+    'tornado-3.1.tar.gz',
+    'jujuclient-0.0.9.tar.gz',
+    'juju-deployer-0.2.2.tar.gz',
+)
 SERVER_DIR = os.path.join(CURRENT_DIR, 'server')
-TORNADO_PATH = os.path.join(CURRENT_DIR, 'deps', 'tornado-3.1.tar.gz')
 
 APACHE_CFG_DIR = os.path.join(os.path.sep, 'etc', 'apache2')
 APACHE_PORTS = os.path.join(APACHE_CFG_DIR, 'ports.conf')
@@ -525,15 +531,13 @@
     remove_apache_setup()
 
 
-def install_tornado():
-    """Install Tornado from a local tarball."""
-    log('Installing Tornado.')
-    with su('root'):
-        cmd_log(run('pip', 'install', TORNADO_PATH))
-
-
 def install_builtin_server():
     """Install the builtin server code."""
+    log('Installing the builtin server dependencies.')
+    for dependency_name in SERVER_DEPENDENCIES:
+        dependency = os.path.join(CURRENT_DIR, 'deps', dependency_name)
+        with su('root'):
+            cmd_log(run('pip', 'install', dependency))
     log('Installing the builtin server.')
     setup_cmd = os.path.join(SERVER_DIR, 'setup.py')
     with su('root'):

=== modified file 'revision'
--- revision	2013-08-21 12:02:49 +0000
+++ revision	2013-08-26 10:30:37 +0000
@@ -1,1 +1,1 @@
-74
+75

=== modified file 'server/guiserver/__init__.py'
--- server/guiserver/__init__.py	2013-07-19 10:25:55 +0000
+++ server/guiserver/__init__.py	2013-08-26 10:30:37 +0000
@@ -30,7 +30,7 @@
 the HTTPS connection, allowing changes in the Juju environment to be propagated
 and shown immediately by the browser. """
 
-VERSION = (0, 0, 1)
+VERSION = (0, 1, 0)
 
 
 def get_version():

=== modified file 'server/guiserver/apps.py'
--- server/guiserver/apps.py	2013-08-19 11:50:15 +0000
+++ server/guiserver/apps.py	2013-08-26 10:30:37 +0000
@@ -17,6 +17,7 @@
 """Juju GUI server applications."""
 
 import os
+import time
 
 from tornado import web
 from tornado.options import options
@@ -25,6 +26,7 @@
     auth,
     handlers,
 )
+from guiserver.bundles.base import Deployer
 
 
 def server():
@@ -36,12 +38,22 @@
     # Set up static paths.
     guiroot = options.guiroot
     static_path = os.path.join(guiroot, 'juju-ui')
+    # Set up the bundle deployer.
+    deployer = Deployer(options.apiurl, options.apiversion)
     # Set up handlers.
     websocket_handler_options = {
         # The Juju API backend url.
         'apiurl': options.apiurl,
         # The backend to use for user authentication.
         'auth_backend': auth.get_backend(options.apiversion),
+        # The Juju deployer to use for importing bundles.
+        'deployer': deployer,
+    }
+    info_handler_options = {
+        'apiurl': options.apiurl,
+        'apiversion': options.apiversion,
+        'deployer': deployer,
+        'start_time': int(time.time()),
     }
     server_handlers = [
         # Handle WebSocket connections.
@@ -50,7 +62,7 @@
         (r'^/juju-ui/(.*)', web.StaticFileHandler, {'path': static_path}),
         (r'^/(favicon\.ico)$', web.StaticFileHandler, {'path': guiroot}),
         # Handle GUI server info.
-        (r'^/gui-server-info', handlers.InfoHandler),
+        (r'^/gui-server-info', handlers.InfoHandler, info_handler_options),
     ]
     if options.testsroot:
         params = {'path': options.testsroot, 'default_filename': 'index.html'}

=== modified file 'server/guiserver/handlers.py'
--- server/guiserver/handlers.py	2013-08-19 12:03:10 +0000
+++ server/guiserver/handlers.py	2013-08-26 10:30:37 +0000
@@ -19,6 +19,7 @@
 from collections import deque
 import logging
 import os
+import time
 
 from tornado import (
     escape,
@@ -33,11 +34,13 @@
     AuthMiddleware,
     User,
 )
+from guiserver.bundles.base import DeployMiddleware
 from guiserver.clients import websocket_connect
 from guiserver.utils import (
     get_headers,
     json_decode_dict,
     request_summary,
+    wrap_write_message,
 )
 
 
@@ -45,7 +48,8 @@
     """WebSocket handler supporting secure WebSockets.
 
     This handler acts as a proxy between the browser connection and the
-    Juju API server.
+    Juju API server. It also handles API authentication and requests for
+    bundles deployment (using the juju-deployer deployment format).
 
     Relevant attributes:
 
@@ -66,7 +70,7 @@
     """
 
     @gen.coroutine
-    def initialize(self, apiurl, auth_backend, io_loop=None):
+    def initialize(self, apiurl, auth_backend, deployer, io_loop=None):
         """Initialize the WebSocket server.
 
         Create a new WebSocket client and connect it to the Juju API.
@@ -84,6 +88,9 @@
         # Set up the authentication infrastructure.
         self.user = User()
         self.auth = AuthMiddleware(self.user, auth_backend)
+        # Set up the bundle deployment infrastructure.
+        self.deployment = DeployMiddleware(
+            self.user, deployer, wrap_write_message(self))
         # Juju requires the Origin header to be included in the WebSocket
         # client handshake request. Propagate the client origin if present;
         # use the Juju API server as origin otherwise.
@@ -111,13 +118,20 @@
     def on_message(self, message):
         """Hook called when a new message is received from the browser.
 
-        The message is propagated to the Juju API server.
+        If the message is a deployment request, start the deployment process.
+        Otherwise the message is propagated to the Juju API server.
         Messages sent before the client connection to the Juju API server is
         established are queued for later delivery.
         """
         data = json_decode_dict(message)
-        if (data is not None) and (not self.user.is_authenticated):
-            self.auth.process_request(data)
+        if data is not None:
+            # Handle deployment requests.
+            if self.deployment.requested(data):
+                return self.deployment.process_request(data)
+            # Handle authentication requests.
+            if not self.user.is_authenticated:
+                self.auth.process_request(data)
+        # Propagate messages to the Juju API server.
         if self.juju_connected:
             logging.debug(self._summary + 'client -> juju: {}'.format(message))
             return self.juju_connection.write_message(message)
@@ -176,9 +190,26 @@
 class InfoHandler(web.RequestHandler):
     """Return information about the GUI server."""
 
+    def initialize(self, apiurl, apiversion, deployer, start_time):
+        """Initialize the handler."""
+        self.apiurl = apiurl
+        self.apiversion = apiversion
+        self.deployer = deployer
+        self.start_time = start_time
+
+    def get_info(self, settings):
+        return {
+            'apiurl': self.apiurl,
+            'apiversion': self.apiversion,
+            'debug': settings.get('debug', False),
+            'deployer': self.deployer.status(),
+            'uptime': int(time.time()) - self.start_time,
+            'version': get_version(),
+        }
+
     def get(self):
         """Handle GET requests."""
-        info = {'version': get_version()}
+        info = self.get_info(self.application.settings)
         self.write(escape.json_encode(info))
 
 

=== modified file 'server/guiserver/tests/helpers.py'
--- server/guiserver/tests/helpers.py	2013-08-23 16:06:21 +0000
+++ server/guiserver/tests/helpers.py	2013-08-26 10:30:37 +0000
@@ -227,6 +227,19 @@
         }
         return json.dumps(data) if encoded else data
 
+    def make_deployment_response(
+            self, request_id=42, response=None, error=None, encoded=False):
+        """Create and return a deployment response message.
+
+        If encoded is set to True, the returned message will be JSON encoded.
+        """
+        if response is None:
+            response = {}
+        data = {'RequestId': request_id, 'Response': response}
+        if error is not None:
+            data['Error'] = error
+        return json.dumps(data) if encoded else data
+
     def patch_validate(self, side_effect=None):
         """Mock the blocking validate function."""
         mock_validate = MultiProcessMock(side_effect=side_effect)

=== modified file 'server/guiserver/tests/test_apps.py'
--- server/guiserver/tests/test_apps.py	2013-08-09 13:26:54 +0000
+++ server/guiserver/tests/test_apps.py	2013-08-26 10:30:37 +0000
@@ -22,8 +22,11 @@
 
 from guiserver import (
     apps,
+    auth,
     handlers,
+    manage,
 )
+from guiserver.bundles import base
 
 
 class AppsTestMixin(object):
@@ -43,6 +46,18 @@
                 return spec
         return None
 
+    def assert_in_spec(self, spec, key, value=None):
+        """Ensure the given key-value pair is present in the specification.
+
+        Also return the value in the specification.
+        """
+        self.assertIsNotNone(spec)
+        self.assertIn(key, spec.kwargs)
+        obtained = spec.kwargs[key]
+        if value is not None:
+            self.assertEqual(value, obtained)
+        return obtained
+
     def test_debug_enabled(self):
         # Debug mode is enabled if options.debug is True.
         app = self.get_app(debug=True)
@@ -67,21 +82,33 @@
         with mock.patch('guiserver.apps.options', options):
             return apps.server()
 
+    def test_auth_backend(self):
+        # The authentication backend instance is correctly passed to the
+        # WebSocket handler.
+        app = self.get_app()
+        spec = self.get_url_spec(app, r'^/ws$')
+        auth_backend = self.assert_in_spec(spec, 'auth_backend')
+        expected = auth.get_backend(manage.DEFAULT_API_VERSION)
+        self.assertIsInstance(auth_backend, type(expected))
+
+    def test_deployer(self):
+        # The deployer instance is correctly passed to the WebSocket handler.
+        app = self.get_app()
+        spec = self.get_url_spec(app, r'^/ws$')
+        deployer = self.assert_in_spec(spec, 'deployer')
+        self.assertIsInstance(deployer, base.Deployer)
+
     def test_static_files(self):
         # The Juju GUI static files are correctly served.
         app = self.get_app()
         spec = self.get_url_spec(app, r'^/juju-ui/(.*)$')
-        self.assertIsNotNone(spec)
-        self.assertIn('path', spec.kwargs)
-        self.assertEqual('/my/guiroot/juju-ui', spec.kwargs['path'])
+        self.assert_in_spec(spec, 'path', value='/my/guiroot/juju-ui')
 
     def test_serving_gui_tests(self):
         # The server can be configured to serve GUI unit tests.
         app = self.get_app(testsroot='/my/tests/')
         spec = self.get_url_spec(app, r'^/test/(.*)$')
-        self.assertIsNotNone(spec)
-        self.assertIn('path', spec.kwargs)
-        self.assertEqual('/my/tests/', spec.kwargs['path'])
+        self.assert_in_spec(spec, 'path', value='/my/tests/')
 
     def test_not_serving_gui_tests(self):
         # The server can be configured to avoid serving GUI unit tests.

=== modified file 'server/guiserver/tests/test_handlers.py'
--- server/guiserver/tests/test_handlers.py	2013-08-19 12:22:33 +0000
+++ server/guiserver/tests/test_handlers.py	2013-08-26 10:30:37 +0000
@@ -43,6 +43,7 @@
     handlers,
     manage,
 )
+from guiserver.bundles import base
 from guiserver.tests import helpers
 
 
@@ -63,6 +64,8 @@
         #   ws-echo-server -> ws-forwarding-client -> ws-server -> ws-client
         self.apiurl = self.get_wss_url('/echo')
         self.api_close_future = concurrent.Future()
+        self.deployer = base.Deployer(
+            self.apiurl, manage.DEFAULT_API_VERSION, io_loop=self.io_loop)
         echo_options = {
             'close_future': self.api_close_future,
             'io_loop': self.io_loop,
@@ -70,6 +73,7 @@
         ws_options = {
             'apiurl': self.apiurl,
             'auth_backend': self.auth_backend,
+            'deployer': self.deployer,
             'io_loop': self.io_loop,
         }
         return web.Application([
@@ -103,7 +107,8 @@
             apiurl = self.apiurl
         handler = self.make_handler(
             headers=headers, mock_protocol=mock_protocol)
-        yield handler.initialize(apiurl, self.auth_backend, self.io_loop)
+        yield handler.initialize(
+            apiurl, self.auth_backend, self.deployer, self.io_loop)
         raise gen.Return(handler)
 
 
@@ -304,6 +309,48 @@
         self.assertFalse(self.handler.auth.in_progress())
 
 
+class TestWebSocketHandlerBundles(
+        WebSocketHandlerTestMixin, helpers.WSSTestMixin,
+        helpers.BundlesTestMixin, LogTrapTestCase, AsyncHTTPSTestCase):
+
+    @gen_test
+    def test_bundle_import_process(self):
+        # The bundle import process is correctly started and completed.
+        write_message_path = 'guiserver.handlers.wrap_write_message'
+        with mock.patch(write_message_path) as mock_write_message:
+            handler = yield self.make_initialized_handler()
+        # Simulate the user is authenticated.
+        handler.user.is_authenticated = True
+        # Start a bundle import.
+        request = self.make_deployment_request('Import', encoded=True)
+        with self.patch_validate(), self.patch_import_bundle():
+            yield handler.on_message(request)
+        expected = self.make_deployment_response(response={'DeploymentId': 0})
+        mock_write_message().assert_called_once_with(expected)
+        # Start observing the deployment progress.
+        request = self.make_deployment_request('Watch', encoded=True)
+        yield handler.on_message(request)
+        expected = self.make_deployment_response(response={'WatcherId': 0})
+        mock_write_message().assert_called_with(expected)
+        # Get the two next changes: in the first one the deployment has been
+        # started, in the second one it is completed. This way the test runner
+        # can safely stop the IO loop (no remaining Future callbacks).
+        request = self.make_deployment_request('Next', encoded=True)
+        yield handler.on_message(request)
+        yield handler.on_message(request)
+
+    @gen_test
+    def test_not_authenticated(self):
+        # The bundle deployment support is only activated for logged in users.
+        client = yield self.make_client()
+        request = self.make_deployment_request('Import', encoded=True)
+        client.write_message(request)
+        expected = self.make_deployment_response(
+            error='unauthorized access: no user logged in')
+        response = yield client.read_message()
+        self.assertEqual(expected, json.loads(response))
+
+
 class TestIndexHandler(LogTrapTestCase, AsyncHTTPTestCase):
 
     def setUp(self):
@@ -343,11 +390,27 @@
 class TestInfoHandler(LogTrapTestCase, AsyncHTTPTestCase):
 
     def get_app(self):
-        return web.Application([(r'^/info', handlers.InfoHandler)])
+        mock_deployer = mock.Mock()
+        mock_deployer.status.return_value = 'deployments status'
+        options = {
+            'apiurl': 'wss://api.example.com:17070',
+            'apiversion': 'clojure',
+            'deployer': mock_deployer,
+            'start_time': 10,
+        }
+        return web.Application([(r'^/info', handlers.InfoHandler, options)])
 
+    @mock.patch('time.time', mock.Mock(return_value=52))
     def test_info(self):
         # The handler correctly returns information about the GUI server.
-        expected = {'version': get_version()}
+        expected = {
+            'apiurl': 'wss://api.example.com:17070',
+            'apiversion': 'clojure',
+            'debug': False,
+            'deployer': 'deployments status',
+            'uptime': 42,
+            'version': get_version(),
+        }
         response = self.fetch('/info')
         self.assertEqual(200, response.code)
         info = escape.json_decode(response.body)

=== modified file 'server/guiserver/tests/test_utils.py'
--- server/guiserver/tests/test_utils.py	2013-08-21 11:39:01 +0000
+++ server/guiserver/tests/test_utils.py	2013-08-26 10:30:37 +0000
@@ -170,6 +170,46 @@
         self.assertEqual('GET /path (127.0.0.1)', summary)
 
 
+class TestWrapWriteMessage(unittest.TestCase):
+
+    expected_log = "discarding message \(closed connection\): 'hello'"
+
+    def setUp(self):
+        self.messages = []
+        self.handler = type(
+            'Handler', (),
+            {'connected': True, 'write_message': self.messages.append}
+        )()
+        self.wrapped = utils.wrap_write_message(self.handler)
+
+    def test_propagated(self):
+        # The JSON encoded version of the message is correctly propagated.
+        self.wrapped({'foo': 'bar'})
+        self.assertEqual(json.dumps({'foo': 'bar'}), self.messages[0])
+
+    def test_multiple_messages(self):
+        # Multiple messages are correctly propagated.
+        self.wrapped(1)
+        self.wrapped(2)
+        self.wrapped(3)
+        self.assertEqual(['1', '2', '3'], self.messages)
+
+    def test_connection_closed(self):
+        # If the handler connection is closed, a warning is logged and the
+        # wrapped method is not called.
+        self.handler.connected = False
+        with ExpectLog('', self.expected_log, required=True):
+            self.wrapped('hello')
+        self.assertEqual([], self.messages)
+
+    def test_handler_deleted(self):
+        # A warning is logged if the referred handler has been deleted.
+        del self.handler
+        with ExpectLog('', self.expected_log, required=True):
+            self.wrapped('hello')
+        self.assertEqual([], self.messages)
+
+
 class TestWsToHttp(unittest.TestCase):
 
     def test_websocket(self):

=== modified file 'server/guiserver/utils.py'
--- server/guiserver/utils.py	2013-08-21 11:39:01 +0000
+++ server/guiserver/utils.py	2013-08-26 10:30:37 +0000
@@ -22,6 +22,7 @@
 import logging
 import os
 import urlparse
+import weakref
 
 from tornado import escape
 
@@ -87,6 +88,29 @@
     return '{} {} ({})'.format(request.method, request.uri, request.remote_ip)
 
 
+def wrap_write_message(handler):
+    """Wrap the write_message() method of the given handler.
+
+    The resulting function uses a weak reference to the handler, in order to
+    avoid calling the wrapped method if the handler (a WebSocket connection)
+    has been closed or garbage collected.
+
+    If the handler is still there, and the connection is still established,
+    JSON encode the received data before propagating it.
+    """
+    handler_ref = weakref.ref(handler)
+
+    def wrapped(data):
+        handler = handler_ref()
+        if (handler is None) or (not handler.connected):
+            return logging.warning(
+                'discarding message (closed connection): {!r}'.format(data))
+        message = escape.json_encode(data)
+        handler.write_message(message)
+
+    return wrapped
+
+
 def ws_to_http(url):
     """Return the HTTP(S) equivalent of the provided ws/wss URL."""
     parts = urlparse.urlsplit(url)

=== modified file 'server/setup.py'
--- server/setup.py	2013-08-07 15:08:16 +0000
+++ server/setup.py	2013-08-26 10:30:37 +0000
@@ -38,7 +38,9 @@
     keywords='juju gui server',
     packages=[
         PROJECT_NAME,
+        '{}.bundles'.format(PROJECT_NAME),
         '{}.tests'.format(PROJECT_NAME),
+        '{}.tests.bundles'.format(PROJECT_NAME),
     ],
     scripts=['runserver.py'],
     classifiers=[

=== modified file 'tests/test_backends.py'
--- tests/test_backends.py	2013-08-07 10:29:06 +0000
+++ tests/test_backends.py	2013-08-26 10:30:37 +0000
@@ -119,7 +119,6 @@
             'get_api_address': utils.get_api_address,
             'get_npm_cache_archive_url': utils.get_npm_cache_archive_url,
             'install_builtin_server': utils.install_builtin_server,
-            'install_tornado': utils.install_tornado,
             'parse_source': utils.parse_source,
             'prime_npm_cache': utils.prime_npm_cache,
             'remove_apache_setup': utils.remove_apache_setup,
@@ -200,7 +199,7 @@
         test_backend.install()
         for mocked in (
             'apt_get_install', 'fetch_api', 'find_missing_packages',
-            'install_builtin_server', 'install_tornado',
+            'install_builtin_server',
         ):
             self.assertTrue(
                 self.called.get(mocked), '{} was not called'.format(mocked))

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2013-08-09 13:30:49 +0000
+++ tests/test_utils.py	2013-08-26 10:30:37 +0000
@@ -33,6 +33,7 @@
     API_PORT,
     JUJU_GUI_DIR,
     JUJU_PEM,
+    SERVER_DEPENDENCIES,
     WEB_PORT,
     _get_by_attr,
     cmd_log,
@@ -46,7 +47,6 @@
     parse_source,
     get_npm_cache_archive_url,
     install_builtin_server,
-    install_tornado,
     remove_apache_setup,
     remove_haproxy_setup,
     render_to_file,
@@ -722,13 +722,11 @@
         self.assertEqual(self.service_names, ['haproxy', 'apache2'])
         self.assertEqual(self.actions, [charmhelpers.STOP, charmhelpers.STOP])
 
-    def test_install_tornado(self):
-        install_tornado()
-        self.assertEqual(self.run_call_count, 1)
-
     def test_install_builtin_server(self):
         install_builtin_server()
-        self.assertEqual(self.run_call_count, 1)
+        # The function executes one "pip install" call for each dependency, and
+        # a final "python setup.py" call for the GUI server itself.
+        self.assertEqual(self.run_call_count, len(SERVER_DEPENDENCIES) + 1)
 
     def test_write_builtin_server_startup(self):
         write_builtin_server_startup(