Merge lp:~frankban/charms/precise/juju-gui/new-darwin into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

New juju-deployer darwin version.

Switched to the new juju-deployer version,
which includes support for deployments started
by the GUI server.

This allows us to remove the blocking/deployer-specific
code from the GUI server.

Also updated the relevant parts of the documentation.

Tests: run `make unittest` from the root of this branch.

https://codereview.appspot.com/13824045/

[Francesco Banconi (frankban)]

Reviewers: mp+187015_code.launchpad.net,

Message:
Please take a look.

Description:
New juju-deployer darwin version.

Switched to the new juju-deployer version,
which includes support for deployments started
by the GUI server.

This allows us to remove the blocking/deployer-specific
code from the GUI server.

Also updated the relevant parts of the documentation.

Tests: run `make unittest` from the root of this branch.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/new-darwin/+merge/187015

(do not edit description out of merge proposal)

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

Affected files (+37, -466 lines):
   A [revision details]
   D deps/juju-deployer-0.2.2.tar.gz
   A deps/juju-deployer-0.2.3.tar.gz
   M hooks/utils.py
   M revision
   M server/guiserver/__init__.py
   M server/guiserver/bundles/__init__.py
   M server/guiserver/bundles/base.py
   D server/guiserver/bundles/blocking.py
   M server/guiserver/tests/bundles/test_base.py
   D server/guiserver/tests/bundles/test_blocking.py
   M server/guiserver/tests/helpers.py
   M server/guiserver/tests/test_utils.py
   M server/guiserver/utils.py

[Gary Poster (gary)]

LGTM. No qa, guessing bac is doing it. Thank you for getting this into
the deployer and connecting with Kapil!

https://codereview.appspot.com/13824045/

[Brad Crittenden (bac)]

LGTM with minor typo. Ran the tests but after talking to Francesco did
not do QA.

https://codereview.appspot.com/13824045/diff/1/server/guiserver/bundles/__init__.py
File server/guiserver/bundles/__init__.py (right):

https://codereview.appspot.com/13824045/diff/1/server/guiserver/bundles/__init__.py#newcode71
server/guiserver/bundles/__init__.py:71: The deployer.guiserver module
in the juju-deployer library is responsible of
s/of/for

https://codereview.appspot.com/13824045/

[lp:~frankban/charms/precise/juju-gui/new-darwin]

118. By Francesco Banconi on 2013-09-23

Changes as per review.

[Francesco Banconi (frankban)]

*** Submitted:

New juju-deployer darwin version.

Switched to the new juju-deployer version,
which includes support for deployments started
by the GUI server.

This allows us to remove the blocking/deployer-specific
code from the GUI server.

Also updated the relevant parts of the documentation.

Tests: run `make unittest` from the root of this branch.

R=gary.poster, bac
CC=
https://codereview.appspot.com/13824045

https://codereview.appspot.com/13824045/diff/1/server/guiserver/bundles/__init__.py
File server/guiserver/bundles/__init__.py (right):

https://codereview.appspot.com/13824045/diff/1/server/guiserver/bundles/__init__.py#newcode71
server/guiserver/bundles/__init__.py:71: The deployer.guiserver module
in the juju-deployer library is responsible of
On 2013/09/23 14:23:17, bac wrote:
> s/of/for

Done.

https://codereview.appspot.com/13824045/

[Francesco Banconi (frankban)]

Thank you both for the reviews!

https://codereview.appspot.com/13824045/

=== removed file 'deps/juju-deployer-0.2.2.tar.gz'
Binary files deps/juju-deployer-0.2.2.tar.gz	2013-08-23 11:01:05 +0000 and deps/juju-deployer-0.2.2.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'deps/juju-deployer-0.2.3.tar.gz'
Binary files deps/juju-deployer-0.2.3.tar.gz	1970-01-01 00:00:00 +0000 and deps/juju-deployer-0.2.3.tar.gz	2013-09-23 14:46:10 +0000 differ
=== modified file 'hooks/utils.py'
--- hooks/utils.py	2013-09-12 19:58:07 +0000
+++ hooks/utils.py	2013-09-23 14:46:10 +0000
@@ -113,7 +113,7 @@
     'futures-2.1.4.tar.gz',
     'tornado-3.1.tar.gz',
     'jujuclient-0.0.9.tar.gz',
-    'juju-deployer-0.2.2.tar.gz',
+    'juju-deployer-0.2.3.tar.gz',
 )
 SERVER_DIR = os.path.join(CURRENT_DIR, 'server')
 

=== modified file 'revision'
--- revision	2013-09-13 08:05:51 +0000
+++ revision	2013-09-23 14:46:10 +0000
@@ -1,1 +1,1 @@
-85
+86

=== modified file 'server/guiserver/__init__.py'
--- server/guiserver/__init__.py	2013-09-12 17:02:58 +0000
+++ server/guiserver/__init__.py	2013-09-23 14:46:10 +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, 2, 0)
+VERSION = (0, 2, 1)
 
 
 def get_version():

=== modified file 'server/guiserver/bundles/__init__.py'
--- server/guiserver/bundles/__init__.py	2013-09-13 08:28:12 +0000
+++ server/guiserver/bundles/__init__.py	2013-09-23 14:46:10 +0000
@@ -41,12 +41,12 @@
       the WebSocket request/response aspects, or how incoming data is retrieved
       or generated.
 
-      The Deployer implementation in this module uses the juju-deployer library
-      to import the provided bundle into the Juju environment. Since the
-      mentioned operations are executed in a separate process, it is safe for
-      the Deployer to interact with the blocking juju-deployer library.
-      Those blocking functions are defined in the blocking module of this
-      package, described below.
+      The Deployer implementation in this package uses the juju-deployer
+      library to import the provided bundle into the Juju environment. Since
+      the mentioned operations are executed in a separate process, it is safe
+      for the Deployer to interact with the blocking juju-deployer library.
+      Those blocking functions are defined in the guiserver module of the
+      juju-deployer project, described below.
 
       Note that the Deployer is not intended to store request related data: one
       instance is created once when the application is bootstrapped and used as
@@ -60,23 +60,24 @@
       views module of this package. The DeployMiddleware dispatches requests
       and collect responses to be sent back to the API client.
 
-The views and blocking modules are responsible of handling the request/response
-process and of starting/scheduling bundle deployments.
+The views module is responsible for handling the request/response process and
+of starting/scheduling bundle deployments.
 
     - views: as already mentioned, the functions in this module handle the
       requests from the API client, and set up responses. Since the views have
       access to the Deployer (described above), they can start/queue bundle
       deployments.
 
-    - blocking: all the blocking functions interacting with the juju-deployer
-      library belong here. Specifically this module defines two functions:
-        - validate: validate a bundle based on the state of the Juju env.;
-        - import_bundle: starts the bundle deployment process.
+The deployer.guiserver module in the juju-deployer library is responsible for
+validating a bundle and starting a deployment. Specifically the module defines
+two functions:
+    - validate: validate a bundle based on the state of the Juju env.;
+    - import_bundle: starts the bundle deployment process.
 
 The infrastructure described above can be summarized like the following
 (each arrow meaning "calls"):
     - request handling: request -> DeployMiddleware -> views
-    - deployment handling: views -> Deployer -> blocking
+    - deployment handling: views -> Deployer -> deployer.guiserver
     - response handling: views -> response
 
 While the DeployMiddleware parses the request data and statically validates

=== modified file 'server/guiserver/bundles/base.py'
--- server/guiserver/bundles/base.py	2013-09-13 08:03:38 +0000
+++ server/guiserver/bundles/base.py	2013-09-23 14:46:10 +0000
@@ -29,12 +29,12 @@
     process,
     ProcessPoolExecutor,
 )
+from deployer import guiserver as blocking
 from tornado import gen
 from tornado.ioloop import IOLoop
 from tornado.util import ObjectDict
 
 from guiserver.bundles import (
-    blocking,
     utils,
     views,
 )
@@ -49,6 +49,18 @@
 # Juju API versions supported by the GUI server Deployer.
 # Tests use the first API version in this list.
 SUPPORTED_API_VERSIONS = ['go']
+# Options used by the juju-deployer Importer instance.
+IMPORTER_OPTIONS = ObjectDict(
+    branch_only=False,  # Avoid just updating VCS branches and exiting.
+    deploy_delay=0,  # Do not sleep between 'deploy' commands.
+    no_local_mods=True,  # Disallow deployment of locally-modified charms.
+    overrides=None,  # Do not override config options.
+    rel_wait=60,  # Wait for 1 minute before checking for relation errors.
+    retry_count=0,  # Do not retry on unit errors.
+    timeout=45*60,  # Set a 45 minutes timeout for the entire deployment.
+    update_charms=False,  # Do not update existing charm branches.
+    watch=False,  # Do not watch environment changes on console.
+)
 
 
 class Deployer(object):
@@ -141,7 +153,8 @@
         # Add the import bundle job to the run executor, and set up a callback
         # to be called when the import process completes.
         future = self._run_executor.submit(
-            blocking.import_bundle, self._apiurl, user.password, name, bundle)
+            blocking.import_bundle,
+            self._apiurl, user.password, name, bundle, IMPORTER_OPTIONS)
         add_future(self._io_loop, future, self._import_callback, deployment_id)
         self._futures[deployment_id] = future
         # If a customized callback is provided, schedule it as well.

=== removed file 'server/guiserver/bundles/blocking.py'
--- server/guiserver/bundles/blocking.py	2013-08-23 12:56:19 +0000
+++ server/guiserver/bundles/blocking.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# This file is part of the Juju GUI, which lets users view and manage Juju
-# environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License version 3, as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Blocking functions and objects for handling bundle deployments.
-
-The following functions and objects use the juju-deployer library to handle
-bundle deployments. They are intended to be run in a separate process.
-Code interacting with the juju-deployer should be stored here.
-"""
-
-import os
-
-from deployer.action.importer import Importer
-from deployer.deployment import Deployment
-from deployer.env import GoEnvironment
-from tornado import util
-
-from guiserver.utils import mkdir
-
-
-IMPORTER_OPTIONS = util.ObjectDict(
-    branch_only=False,  # Avoid just updating VCS branches and exiting.
-    deploy_delay=0,  # Do not sleep between 'deploy' commands.
-    no_local_mods=True,  # Disallow deployment of locally-modified charms.
-    overrides=None,  # Do not override config options.
-    rel_wait=60,  # Wait for 1 minute before checking for relation errors.
-    retry_count=0,  # Do not retry on unit errors.
-    timeout=45*60,  # Set a 45 minutes timeout for the entire deployment.
-    update_charms=False,  # Do not update existing charm branches.
-    watch=False,  # Do not watch environment changes on console.
-)
-# This value is used by the juju-deployer Importer object to store charms.
-JUJU_HOME = '/var/lib/juju/gui-server/juju-home'
-
-
-class _Environment(GoEnvironment):
-    """A Juju environment for the juju-deployer.
-
-    Add support for deployments via the Juju API and for authenticating with
-    the provided password.
-    """
-
-    def __init__(self, endpoint, password):
-        super(_Environment, self).__init__('go', endpoint=endpoint)
-        self._password = password
-
-    def _get_token(self):
-        """Return the stored password.
-
-        This method is overridden so that the juju-deployer does not try to
-        parse the environments.yaml file in order to retrieve the admin-secret.
-        """
-        return self._password
-
-    def connect(self):
-        """Connect the API client to the Juju backend.
-
-        This method is overridden so that a call to connect is a no-op if the
-        client is already connected.
-        """
-        if self.client is None:
-            super(_Environment, self).connect()
-
-    def close(self):
-        """Close the API connection.
-
-        Also set the client attribute to None after the disconnection.
-        """
-        super(_Environment, self).close()
-        self.client = None
-
-    def deploy(
-            self, name, charm_url, config=None, constraints=None, num_units=1,
-            *args, **kwargs):
-        """Deploy a service using the API.
-
-        Using the API in place of the command line introduces some limitations:
-          - it is not possible to use a local charm/repository;
-          - it is not possible to deploy to a specific machine.
-        """
-        self.client.deploy(
-            name, charm_url, config=config, constraints=constraints,
-            num_units=num_units)
-
-
-def _validate(env, bundle):
-    """Bundle validation logic, used by both validate and import_bundle.
-
-    This function receives a connected environment and the bundle as a YAML
-    decoded object.
-    """
-    # Retrieve the services deployed in the Juju environment.
-    env_status = env.status()
-    env_services = set(env_status['services'].keys())
-    # Retrieve the services in the bundle.
-    bundle_services = set(bundle.get('services', {}).keys())
-    # Calculate overlapping services.
-    overlapping = env_services.intersection(bundle_services)
-    if overlapping:
-        services = ', '.join(overlapping)
-        error = 'service(s) already in the environment: {}'.format(services)
-        raise ValueError(error)
-
-
-def validate(apiurl, password, bundle):
-    """Validate a bundle."""
-    env = _Environment(apiurl, password)
-    env.connect()
-    try:
-        _validate(env, bundle)
-    finally:
-        env.close()
-
-
-def import_bundle(apiurl, password, name, bundle):
-    """Import a bundle."""
-    env = _Environment(apiurl, password)
-    deployment = Deployment(name, bundle, [])
-    importer = Importer(env, deployment, IMPORTER_OPTIONS)
-    env.connect()
-    # The Importer tries to retrieve the Juju home from the JUJU_HOME
-    # environment variable: create a customized directory (if required) and
-    # set up the environment context for the Importer.
-    mkdir(JUJU_HOME)
-    os.environ['JUJU_HOME'] = JUJU_HOME
-    try:
-        _validate(env, bundle)
-        importer.run()
-    finally:
-        env.close()

=== modified file 'server/guiserver/tests/bundles/test_base.py'
--- server/guiserver/tests/bundles/test_base.py	2013-09-13 14:09:40 +0000
+++ server/guiserver/tests/bundles/test_base.py	2013-09-23 14:46:10 +0000
@@ -111,7 +111,8 @@
         # Wait for the deployment to be completed.
         self.wait()
         mock_import_bundle.assert_called_once_with(
-            self.apiurl, self.user.password, 'bundle', self.bundle)
+            self.apiurl, self.user.password, 'bundle', self.bundle,
+            base.IMPORTER_OPTIONS)
         mock_import_bundle.assert_called_in_a_separate_process()
 
     def test_watch(self):

=== removed file 'server/guiserver/tests/bundles/test_blocking.py'
--- server/guiserver/tests/bundles/test_blocking.py	2013-08-23 16:06:21 +0000
+++ server/guiserver/tests/bundles/test_blocking.py	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-# This file is part of the Juju GUI, which lets users view and manage Juju
-# environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License version 3, as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Tests for the bundles support blocking functions and objects."""
-
-from contextlib import contextmanager
-import os
-import shutil
-import tempfile
-import unittest
-
-import mock
-
-from guiserver.bundles import blocking
-from guiserver.tests import helpers
-
-
[e-mail]('deployer.env.go.EnvironmentClient')
-class TestEnvironment(unittest.TestCase):
-
-    endpoint = 'wss://api.example.com:17070'
-    password = 'Secret!'
-
-    def setUp(self):
-        self.env = blocking._Environment(self.endpoint, self.password)
-
-    def test_connect(self, mock_client):
-        # The environment uses the provided endpoint and password to connect
-        # to the Juju API server.
-        self.env.connect()
-        mock_client.assert_called_once_with(self.endpoint)
-        mock_client().login.assert_called_once_with(self.password)
-
-    def test_multiple_connections(self, mock_client):
-        # The environment does not attempt a second connection if it is already
-        # connected to the API backend.
-        self.env.connect()
-        self.env.connect()
-        self.assertEqual(1, mock_client.call_count)
-
-    def test_close(self, mock_client):
-        # The client attribute is set to None when the connection is closed.
-        self.env.connect()
-        self.env.close()
-        self.assertIsNone(self.env.client)
-
-    def test_deploy(self, mock_client):
-        # The environment uses the API to deploy charms.
-        self.env.connect()
-        config = {'foo': 'bar'}
-        constraints = {'cpu': 4}
-        # Deploy a service: the last two arguments (force_machine and repo) are
-        # ignored.
-        self.env.deploy(
-            'myservice', 'cs:precise/service-42', config=config,
-            constraints=constraints, num_units=2, force_machine=1, repo='/tmp')
-        mock_client().deploy.assert_called_once_with(
-            'myservice', 'cs:precise/service-42', config=config,
-            constraints=constraints, num_units=2)
-
-
-class DeployerFunctionsTestMixin(helpers.BundlesTestMixin):
-    """Base set up for the functions that make use of the juju-deployer."""
-
-    apiurl = 'wss://api.example.com:17070'
-    password = 'Secret!'
-
-    def setUp(self):
-        self.name, self.bundle = self.get_name_and_bundle()
-
-    def check_environment_life(self, mock_environment):
-        """Check the calls executed on the given mock environment.
-
-        Ensure that, in order to retrieve the list of currently deployed
-        services, the environment is instantiated, connected, env.status is
-        called and then the connection is closed.
-        """
-        mock_environment.assert_called_once_with(self.apiurl, self.password)
-        mock_env_instance = mock_environment()
-        mock_env_instance.connect.assert_called_once_with()
-        mock_env_instance.status.assert_called_once_with()
-        mock_env_instance.close.assert_called_once_with()
-
-    @contextmanager
-    def assert_overlapping_services(self, mock_environment):
-        """Ensure a ValueError is raised in the context manager block.
-
-        The given mock environment object is set up so that its status
-        simulates an existing service. The name of this service overlaps with
-        the name of one of the services in the bundle.
-        """
-        mock_env_instance = mock_environment()
-        mock_env_instance.status.return_value = {'services': {'mysql': {}}}
-        # Ensure a ValueError is raised by the code in the context block.
-        with self.assertRaises(ValueError) as context_manager:
-            yield
-        # The error reflects the overlapping service name.
-        error = str(context_manager.exception)
-        self.assertEqual('service(s) already in the environment: mysql', error)
-        # Even if an error occurs, the environment connection is closed.
-        mock_env_instance.close.assert_called_once_with()
-
-
[e-mail]('guiserver.bundles.blocking._Environment')
-class TestValidate(DeployerFunctionsTestMixin, unittest.TestCase):
-
-    def test_validation(self, mock_environment):
-        # The validation is correctly run.
-        blocking.validate(self.apiurl, self.password, self.bundle)
-        # The environment is correctly instantiated and used.
-        self.check_environment_life(mock_environment)
-
-    def test_overlapping_services(self, mock_environment):
-        # The validation fails if the bundle includes a service name already
-        # present in the Juju environment.
-        with self.assert_overlapping_services(mock_environment):
-            blocking.validate(self.apiurl, self.password, self.bundle)
-
-
[e-mail]('guiserver.bundles.blocking._Environment')
-class TestImportBundle(DeployerFunctionsTestMixin, unittest.TestCase):
-
-    @contextmanager
-    def patch_juju_home(self):
-        """Patch the value used by the bundle importer as Juju home."""
-        base_dir = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, base_dir)
-        juju_home = os.path.join(base_dir, 'juju-home')
-        with mock.patch('guiserver.bundles.blocking.JUJU_HOME', juju_home):
-            yield juju_home
-
-    @mock.patch('guiserver.bundles.blocking.Importer')
-    def test_importing_bundle(self, mock_importer, mock_environment):
-        # The juju-deployer importer is correctly set up and run.
-        with self.patch_juju_home():
-            blocking.import_bundle(
-                self.apiurl, self.password, self.name, self.bundle)
-        # The environment is correctly instantiated and used.
-        self.check_environment_life(mock_environment)
-        # The importer is correctly instantiated.
-        self.assertEqual(1, mock_importer.call_count)
-        importer_args = mock_importer.call_args[0]
-        self.assertEqual(3, len(importer_args))
-        env, deployment, options = importer_args
-        # The first argument passed to the importer is the environment.
-        self.assertIs(mock_environment(), env)
-        # The second argument is the deployment object.
-        self.assertIsInstance(deployment, blocking.Deployment)
-        self.assertEqual(self.name, deployment.name)
-        self.assertEqual(self.bundle, deployment.data)
-        # The third and last argument is the options object.
-        self.assertIs(blocking.IMPORTER_OPTIONS, options)
-        # The importer is started.
-        mock_importer().run.assert_called_once_with()
-
-    def test_overlapping_services(self, mock_environment):
-        # The import fails if the bundle includes a service name already
-        # present in the Juju environment.
-        with self.assert_overlapping_services(mock_environment):
-            with self.patch_juju_home():
-                blocking.import_bundle(
-                    self.apiurl, self.password, self.name, self.bundle)
-
-    @mock.patch('guiserver.bundles.blocking.Importer')
-    def test_juju_home(self, mock_importer, mock_environment):
-        # A customized Juju home is created and used during the import process.
-        with self.patch_juju_home() as juju_home:
-            assert not os.path.isdir(juju_home), 'directory should not exist'
-            # Ensure JUJU_HOME is included in the context when the Importer
-            # instance is run.
-            run = lambda: self.assertEqual(juju_home, os.getenv('JUJU_HOME'))
-            mock_importer().run = run
-            blocking.import_bundle(
-                self.apiurl, self.password, self.name, self.bundle)
-        # The JUJU_HOME directory has been created.
-        self.assertTrue(os.path.isdir(juju_home))

=== modified file 'server/guiserver/tests/helpers.py'
--- server/guiserver/tests/helpers.py	2013-08-26 08:07:36 +0000
+++ server/guiserver/tests/helpers.py	2013-09-23 14:46:10 +0000
@@ -25,7 +25,6 @@
 
 import mock
 from tornado import websocket
-import yaml
 
 from guiserver import auth
 from guiserver.bundles import base
@@ -140,52 +139,6 @@
     """Add helper methods for testing the GUI server bundles support."""
 
     apiurl = 'wss://api.example.com:17070'
-    bundle = """
-        envExport:
-          series: precise
-          services:
-            wordpress:
-              charm: "cs:precise/wordpress-15"
-              num_units: 1
-              options:
-                debug: "no"
-                engine: nginx
-                tuning: single
-                "wp-content": ""
-              annotations:
-                "gui-x": 313
-                "gui-y": 51
-            mysql:
-              charm: "cs:precise/mysql-26"
-              num_units: 1
-              options:
-                "binlog-format": MIXED
-                "block-size": "5"
-                "dataset-size": "80%"
-                flavor: distro
-                "ha-bindiface": eth0
-                "ha-mcastport": "5411"
-                "max-connections": "-1"
-                "preferred-storage-engine": InnoDB
-                "query-cache-size": "-1"
-                "query-cache-type": "OFF"
-                "rbd-name": mysql1
-                "tuning-level": safest
-                vip: ""
-                vip_cidr: "24"
-                vip_iface: eth0
-              annotations:
-                "gui-x": 669.5
-                "gui-y": -33.5
-          relations:
-            - - "wordpress:db"
-              - "mysql:db"
-    """
-
-    def get_name_and_bundle(self):
-        """Return a tuple (bundle name, contents) parsing self.bundle."""
-        all_contents = yaml.load(self.bundle)
-        return all_contents.items()[0]
 
     def make_deployer(self, apiversion=base.SUPPORTED_API_VERSIONS[0]):
         """Create and return a Deployer instance."""
@@ -243,12 +196,13 @@
     def patch_validate(self, side_effect=None):
         """Mock the blocking validate function."""
         mock_validate = MultiProcessMock(side_effect=side_effect)
-        return mock.patch('guiserver.bundles.blocking.validate', mock_validate)
+        validate_path = 'guiserver.bundles.base.blocking.validate'
+        return mock.patch(validate_path, mock_validate)
 
     def patch_import_bundle(self, side_effect=None):
         """Mock the blocking import_bundle function."""
         mock_import_bundle = MultiProcessMock(side_effect=side_effect)
-        import_bundle_path = 'guiserver.bundles.blocking.import_bundle'
+        import_bundle_path = 'guiserver.bundles.base.blocking.import_bundle'
         return mock.patch(import_bundle_path, mock_import_bundle)
 
 

=== modified file 'server/guiserver/tests/test_utils.py'
--- server/guiserver/tests/test_utils.py	2013-08-23 15:22:19 +0000
+++ server/guiserver/tests/test_utils.py	2013-09-23 14:46:10 +0000
@@ -17,9 +17,6 @@
 """Tests for the Juju GUI server utilities."""
 
 import json
-import os
-import shutil
-import tempfile
 import unittest
 
 import mock
@@ -113,54 +110,6 @@
             self.assertIsNone(utils.json_decode_dict('"not-a-dict"'))
 
 
-class TestMkdir(unittest.TestCase):
-
-    def setUp(self):
-        self.playground = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.playground)
-
-    def test_create_dir(self):
-        # A directory is correctly created.
-        path = os.path.join(self.playground, 'foo')
-        utils.mkdir(path)
-        self.assertTrue(os.path.isdir(path))
-
-    def test_intermediate_dirs(self):
-        # All intermediate directories are created.
-        path = os.path.join(self.playground, 'foo', 'bar', 'leaf')
-        utils.mkdir(path)
-        self.assertTrue(os.path.isdir(path))
-
-    def test_expand_user(self):
-        # The ~ construction is expanded.
-        with mock.patch('os.environ', {'HOME': self.playground}):
-            utils.mkdir('~/in/my/home')
-        path = os.path.join(self.playground, 'in', 'my', 'home')
-        self.assertTrue(os.path.isdir(path))
-
-    def test_existing_dir(self):
-        # The function exits without errors if the target directory exists.
-        path = os.path.join(self.playground, 'foo')
-        os.mkdir(path)
-        utils.mkdir(path)
-
-    def test_existing_file(self):
-        # An OSError is raised if a file already exists in the target path.
-        path = os.path.join(self.playground, 'foo')
-        with open(path, 'w'):
-            with self.assertRaises(OSError):
-                utils.mkdir(path)
-
-    def test_failure(self):
-        # Errors are correctly re-raised.
-        path = os.path.join(self.playground, 'foo')
-        os.chmod(self.playground, 0000)
-        self.addCleanup(os.chmod, self.playground, 0700)
-        with self.assertRaises(OSError):
-            utils.mkdir(os.path.join(path))
-        self.assertFalse(os.path.exists(path))
-
-
 class TestRequestSummary(unittest.TestCase):
 
     def test_summary(self):

=== modified file 'server/guiserver/utils.py'
--- server/guiserver/utils.py	2013-08-23 15:22:19 +0000
+++ server/guiserver/utils.py	2013-09-23 14:46:10 +0000
@@ -17,10 +17,8 @@
 """Juju GUI server utility functions and classes."""
 
 import collections
-import errno
 import functools
 import logging
-import os
 import urlparse
 import weakref
 
@@ -68,21 +66,6 @@
     return data
 
 
-def mkdir(path):
-    """Create a leaf directory and all intermediate ones.
-
-    Also expand ~ and ~user constructions.
-    If path exists and it's a directory, return without errors.
-    """
-    path = os.path.expanduser(path)
-    try:
-        os.makedirs(path)
-    except OSError as err:
-        # Re-raise the error if the target path exists but it is not a dir.
-        if (err.errno != errno.EEXIST) or (not os.path.isdir(path)):
-            raise
-
-
 def request_summary(request):
     """Return a string representing a summary for the given request."""
     return '{} {} ({})'.format(request.method, request.uri, request.remote_ip)