Merge lp:~frankban/juju-quickstart/jujuutils into lp:juju-quickstart

[Francesco Banconi]

Refactor/split utils code.

Move code from utils to the new jujutools and models/bundles modules.
This branch only include moved code and it's done
in preparation for the Juju API new login work.

https://codereview.appspot.com/204770043/

[Francesco Banconi (frankban)]

Reviewers: mp+249073_code.launchpad.net,

Message:
Please take a look.

Description:
Refactor/split utils code.

Move code from utils to the new jujutools and models/bundles modules.
This branch only include moved code and it's done
in preparation for the Juju API new login work.

https://code.launchpad.net/~frankban/juju-quickstart/jujuutils/+merge/249073

(do not edit description out of merge proposal)

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

Affected files (+715, -599 lines):
   A [revision details]
   M quickstart/app.py
   A quickstart/jujutools.py
   M quickstart/manage.py
   A quickstart/models/bundles.py
   A quickstart/tests/models/test_bundles.py
   A quickstart/tests/test_jujutools.py
   M quickstart/tests/test_utils.py
   M quickstart/utils.py

[Brad Crittenden (bac)]

LGTM. Will do QA shortly.

https://codereview.appspot.com/204770043/diff/1/quickstart/models/bundles.py
File quickstart/models/bundles.py (right):

https://codereview.appspot.com/204770043/diff/1/quickstart/models/bundles.py#newcode59
quickstart/models/bundles.py:59: def parse_bundle(bundle_yaml,
bundle_name=None):
Nice that you've made bundles a real person!

https://codereview.appspot.com/204770043/

[Brad Crittenden (bac)]

QA-OK

https://codereview.appspot.com/204770043/

[Francesco Banconi (frankban)]

*** Submitted:

Refactor/split utils code.

Move code from utils to the new jujutools and models/bundles modules.
This branch only include moved code and it's done
in preparation for the Juju API new login work.

R=bac
CC=
https://codereview.appspot.com/204770043

https://codereview.appspot.com/204770043/

[Francesco Banconi (frankban)]

Thanks for the review and QA Brad!

https://codereview.appspot.com/204770043/

=== modified file 'quickstart/app.py'
--- quickstart/app.py	2015-02-09 10:38:25 +0000
+++ quickstart/app.py	2015-02-09 13:39:50 +0000
@@ -30,6 +30,7 @@
 
 from quickstart import (
     juju,
+    jujutools,
     netutils,
     platform_support,
     settings,
@@ -265,11 +266,11 @@
             continue
         # Ensure the state server is up and the agent is started.
         try:
-            agent_state = utils.get_agent_state(output)
+            agent_state = jujutools.get_agent_state(output)
         except ValueError:
             continue
         if agent_state == 'started':
-            return utils.get_bootstrap_node_series(output)
+            return jujutools.get_bootstrap_node_series(output)
         # If the agent is in an error state, there is nothing we can do, and
         # it's not useful to keep trying.
         if agent_state == 'error':
@@ -408,7 +409,8 @@
             status = env.get_status()
         except jujuclient.EnvError as err:
             raise ProgramExit('bad API response: {}'.format(err.message))
-        service_data, unit_data = utils.get_service_info(status, service_name)
+        service_data, unit_data = jujutools.get_service_info(
+            status, service_name)
     if service_data is None:
         # The service does not exist in the environment.
         if charm_url is None:
@@ -429,7 +431,7 @@
         # A deployed service already exists in the environment: ignore the
         # provided charm URL and just use the already deployed charm.
         charm_url = service_data['CharmURL']
-    charm = utils.parse_gui_charm_url(charm_url)
+    charm = jujutools.parse_gui_charm_url(charm_url)
     # Deploy on the bootstrap node if the following conditions are satisfied:
     # - we are not using the local provider (which uses localhost);
     # - we are not using the azure provider (in which availability sets prevent
 
=== added file 'quickstart/jujutools.py'
--- quickstart/jujutools.py	1970-01-01 00:00:00 +0000
+++ quickstart/jujutools.py	2015-02-09 13:39:50 +0000
@@ -0,0 +1,127 @@
+# This file is part of the Juju Quickstart Plugin, which lets users set up a
+# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
+# Copyright (C) 2015 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/>.
+
+"""Quickstart utility functions for managing Juju environments and entities."""
+
+from __future__ import (
+    print_function,
+    unicode_literals,
+)
+
+import logging
+
+from quickstart import (
+    serializers,
+    settings,
+)
+from quickstart.models import charms
+
+
+def get_service_info(status, service_name):
+    """Retrieve information on the given service and on its first alive unit.
+
+    Return a tuple containing two values: (service data, unit data).
+    Each value can be:
+        - a dictionary of data about the given entity (service or unit) as
+          returned by the Juju watcher;
+        - None, if the entity is not present in the Juju environment.
+    If the service data is None, the unit data is always None.
+    """
+    services = [
+        data for entity, action, data in status if
+        (entity == 'service') and (action != 'remove') and
+        (data['Name'] == service_name) and (data['Life'] == 'alive')
+    ]
+    if not services:
+        return None, None
+    units = [
+        data for entity, action, data in status if
+        entity == 'unit' and action != 'remove' and
+        data['Service'] == service_name
+    ]
+    return services[0], units[0] if units else None
+
+
+def parse_gui_charm_url(charm_url):
+    """Parse the given charm URL.
+
+    Check if the charm looks like a Juju GUI charm.
+    Print (to stdout or to logs) info and warnings about the charm URL.
+
+    Return the parsed charm object as an instance of
+    quickstart.models.charms.Charm.
+    """
+    print('charm URL: {}'.format(charm_url))
+    charm = charms.Charm.from_url(charm_url)
+    charm_name = settings.JUJU_GUI_CHARM_NAME
+    if charm.name != charm_name:
+        # This does not seem to be a Juju GUI charm.
+        logging.warn(
+            'unexpected URL for the {} charm: '
+            'the service may not work as expected'.format(charm_name))
+        return charm
+    if charm.user or charm.is_local():
+        # This is not the official Juju GUI charm.
+        logging.warn('using a customized {} charm'.format(charm_name))
+    elif charm.revision < settings.MINIMUM_REVISIONS_FOR_BUNDLES[charm.series]:
+        # This is the official Juju GUI charm, but it is outdated.
+        logging.warn(
+            'charm is outdated and may not support bundle deployments')
+    return charm
+
+
+def parse_status_output(output, keys=None):
+    """Parse the output of juju status.
+
+    Return selection specified by the keys array.
+    Raise a ValueError if the selection cannot be retrieved.
+    """
+    if keys is None:
+        keys = ['dummy']
+    try:
+        status = serializers.yaml_load(output)
+    except Exception as err:
+        raise ValueError(b'unable to parse the output: {}'.format(err))
+
+    selection = status
+    for key in keys:
+        try:
+            selection = selection.get(key, {})
+        except AttributeError as err:
+            msg = 'invalid YAML contents: {}'.format(status)
+            raise ValueError(msg.encode('utf-8'))
+    if selection == {}:
+        msg = '{} not found in {}'.format(':'.join(keys), status)
+        raise ValueError(msg.encode('utf-8'))
+    return selection
+
+
+def get_agent_state(output):
+    """Parse the output of juju status for the agent state.
+
+    Return the agent state.
+    Raise a ValueError if the agent state cannot be retrieved.
+    """
+    return parse_status_output(output, ['machines', '0', 'agent-state'])
+
+
+def get_bootstrap_node_series(output):
+    """Parse the output of juju status for the agent state.
+
+    Return the agent state.
+    Raise a ValueError if the agent state cannot be retrieved.
+    """
+    return parse_status_output(output, ['machines', '0', 'series'])
 
=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2015-01-30 15:27:07 +0000
+++ quickstart/manage.py	2015-02-09 13:39:50 +0000
@@ -43,6 +43,7 @@
     views,
 )
 from quickstart.models import (
+    bundles,
     charms,
     envs,
     jenv,
@@ -107,7 +108,7 @@
     if bundle.startswith('bundle:') or bundle.startswith(jujucharms_prefix):
         # Convert "bundle:" or jujucharms.com URLs into Charmworld HTTPS ones.
         try:
-            bundle, bundle_id = utils.convert_bundle_url(bundle)
+            bundle, bundle_id = bundles.convert_bundle_url(bundle)
         except ValueError as err:
             return parser.error('unable to open the bundle: {}'.format(err))
         # The next if block below will then load the bundle contents from the
@@ -130,7 +131,7 @@
             return parser.error('unable to open bundle file: {}'.format(err))
     # Validate the bundle.
     try:
-        bundle_name, bundle_services = utils.parse_bundle(
+        bundle_name, bundle_services = bundles.parse_bundle(
             bundle_yaml, options.bundle_name)
     except ValueError as err:
         return parser.error(bytes(err))
 
=== added file 'quickstart/models/bundles.py'
--- quickstart/models/bundles.py	1970-01-01 00:00:00 +0000
+++ quickstart/models/bundles.py	2015-02-09 13:39:50 +0000
@@ -0,0 +1,118 @@
+# This file is part of the Juju Quickstart Plugin, which lets users set up a
+# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
+# Copyright (C) 2015 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/>.
+
+"""Juju Quickstart bundles management."""
+
+from __future__ import unicode_literals
+
+import collections
+import re
+
+from quickstart import (
+    serializers,
+    settings,
+)
+
+
+# Compile the regular expression used to parse bundle URLs.
+_bundle_expression = re.compile(r"""
+    # Bundle schema or bundle URL namespace on jujucharms.com.
+    ^(?:bundle:|{})
+    (?:~([-\w]+)/)?  # Optional user name.
+    ([-\w]+)/  # Basket name.
+    (?:(\d+)/)?  # Optional bundle revision number.
+    ([-\w]+)  # Bundle name.
+    /?$  # Optional trailing slash.
+""".format(settings.JUJUCHARMS_BUNDLE_URL), re.VERBOSE)
+
+
+def convert_bundle_url(bundle_url):
+    """Return the equivalent YAML HTTPS location for the given bundle URL.
+
+    Raise a ValueError if the given URL is not a valid bundle URL.
+    """
+    match = _bundle_expression.match(bundle_url)
+    if match is None:
+        msg = 'invalid bundle URL: {}'.format(bundle_url)
+        raise ValueError(msg.encode('utf-8'))
+    user, basket, revision, name = match.groups()
+    user_part = '~charmers/' if user is None else '~{}/'.format(user)
+    revision_part = '' if revision is None else '{}/'.format(revision)
+    bundle_id = '{}{}/{}{}'.format(user_part, basket, revision_part, name)
+    return ('https://manage.jujucharms.com/bundle/{}/json'.format(bundle_id),
+            bundle_id)
+
+
+def parse_bundle(bundle_yaml, bundle_name=None):
+    """Parse the provided bundle YAML encoded contents.
+
+    Since a valid JSON is a subset of YAML this function can be used also to
+    parse JSON encoded contents.
+
+    Return a tuple containing the bundle name and the list of services included
+    in the bundle.
+
+    Raise a ValueError if:
+      - the bundle YAML contents are not parsable by YAML;
+      - the YAML contents are not properly structured;
+      - the bundle name is specified but not included in the bundle file;
+      - the bundle name is not specified and the bundle file includes more than
+        one bundle;
+      - the bundle does not include services.
+    """
+    # Parse the bundle file.
+    try:
+        bundles = serializers.yaml_load(bundle_yaml)
+    except Exception as err:
+        msg = b'unable to parse the bundle: {}'.format(err)
+        raise ValueError(msg)
+    # Ensure the bundle file is well formed and contains at least one bundle.
+    if not isinstance(bundles, collections.Mapping):
+        msg = 'invalid YAML contents: {}'.format(bundle_yaml)
+        raise ValueError(msg.encode('utf-8'))
+    try:
+        name_services_map = dict(
+            (key, value['services'].keys())
+            for key, value in bundles.items()
+        )
+    except (AttributeError, KeyError, TypeError):
+        msg = 'invalid YAML contents: {}'.format(bundle_yaml)
+        raise ValueError(msg.encode('utf-8'))
+    if not name_services_map:
+        raise ValueError(b'no bundles found')
+    # Retrieve the bundle name and services.
+    if bundle_name is None:
+        if len(name_services_map) > 1:
+            msg = 'multiple bundles found ({}) but no bundle name specified'
+            bundle_names = ', '.join(sorted(name_services_map.keys()))
+            raise ValueError(msg.format(bundle_names).encode('utf-8'))
+        bundle_name, bundle_services = name_services_map.items()[0]
+    else:
+        bundle_services = name_services_map.get(bundle_name)
+        if bundle_services is None:
+            msg = 'bundle {} not found in the provided list of bundles ({})'
+            bundle_names = ', '.join(sorted(name_services_map.keys()))
+            raise ValueError(
+                msg.format(bundle_name, bundle_names).encode('utf-8'))
+    if not bundle_services:
+        msg = 'bundle {} does not include any services'.format(bundle_name)
+        raise ValueError(msg.encode('utf-8'))
+    if settings.JUJU_GUI_SERVICE_NAME in bundle_services:
+        msg = ('bundle {} contains an instance of juju-gui. quickstart will '
+               'install the latest version of the Juju GUI automatically, '
+               'please remove juju-gui from the bundle.'.format(bundle_name))
+        raise ValueError(msg.encode('utf-8'))
+    return bundle_name, bundle_services
 
=== added file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py	1970-01-01 00:00:00 +0000
+++ quickstart/tests/models/test_bundles.py	2015-02-09 13:39:50 +0000
@@ -0,0 +1,254 @@
+# This file is part of the Juju Quickstart Plugin, which lets users set up a
+# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
+# Copyright (C) 2015 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 Juju Quickstart bundles management."""
+
+from __future__ import unicode_literals
+
+import json
+import unittest
+
+import yaml
+
+from quickstart import settings
+from quickstart.models import bundles
+from quickstart.tests import helpers
+
+
+class TestConvertBundleUrl(helpers.ValueErrorTestsMixin, unittest.TestCase):
+
+    def test_full_bundle_url(self):
+        # The HTTPS location to the YAML contents is correctly returned.
+        bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki'
+        url, bundle_id = bundles.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
+
+    def test_bundle_url_right_strip(self):
+        # The trailing slash in the bundle URL is removed.
+        bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki/'
+        url, bundle_id = bundles.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
+
+    def test_bundle_url_no_revision(self):
+        # The bundle revision is optional.
+        bundle_url = 'bundle:~myuser/wiki-bundle/wiki-simple'
+        url, bundle_id = bundles.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/wiki-simple/json', url)
+        self.assertEqual('~myuser/wiki-bundle/wiki-simple', bundle_id)
+
+    def test_bundle_url_no_user(self):
+        # If the bundle user is not specified, the bundle is assumed to be
+        # promulgated and owned by "charmers".
+        bundle_url = 'bundle:wiki-bundle/1/wiki'
+        url, bundle_id = bundles.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/1/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/1/wiki', bundle_id)
+
+    def test_bundle_url_short_form(self):
+        # A promulgated bundle URL can just include the basket and the name.
+        bundle_url = 'bundle:wiki-bundle/wiki'
+        url, bundle_id = bundles.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
+
+    def test_full_jujucharms_url(self):
+        # The HTTPS location to the YAML contents is correctly returned.
+        url, bundle_id = bundles.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki-bundle/42/wiki')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
+
+    def test_jujucharms_url_right_strip(self):
+        # The trailing slash in the jujucharms URL is removed.
+        url, bundle_id = bundles.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~charmers/mediawiki/6/scalable/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/mediawiki/6/scalable/json', url)
+        self.assertEqual('~charmers/mediawiki/6/scalable', bundle_id)
+
+    def test_jujucharms_url_no_revision(self):
+        # The bundle revision is optional.
+        url, bundle_id = bundles.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki/wiki-simple/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki/wiki-simple/json', url)
+        self.assertEqual('~myuser/wiki/wiki-simple', bundle_id)
+
+    def test_jujucharms_url_no_user(self):
+        # If the bundle user is not specified, the bundle is assumed to be
+        # promulgated and owned by "charmers".
+        url, bundle_id = bundles.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + 'mediawiki/42/single/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/mediawiki/42/single/json', url)
+        self.assertEqual('~charmers/mediawiki/42/single', bundle_id)
+
+    def test_jujucharms_url_short_form(self):
+        # A jujucharms URL for a promulgated bundle can just include the basket
+        # and the name.
+        url, bundle_id = bundles.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + 'wiki-bundle/wiki/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
+
+    def test_error(self):
+        # A ValueError is raised if the bundle/jujucharms URL is not valid.
+        bad_urls = (
+            'bad', 'bundle:', 'bundle:~user', 'bundle:no-such',
+            'bundle:~user/name', 'bundle:~user/basket/revision/name',
+            'bundle:basket/name//', 'bundle:basket.name/bundle.name',
+            settings.JUJUCHARMS_BUNDLE_URL,
+            settings.JUJUCHARMS_BUNDLE_URL + 'bad',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/no-such',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/revision/name/',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/42/name/error',
+            'https://jujucharms.com/charms/mediawiki/simple/',
+        )
+        for url in bad_urls:
+            with self.assert_value_error('invalid bundle URL: {}'.format(url)):
+                bundles.convert_bundle_url(url)
+
+
+class TestParseBundle(
+        helpers.BundleFileTestsMixin, helpers.ValueErrorTestsMixin,
+        unittest.TestCase):
+
+    def assert_bundle(
+            self, expected_name, expected_services, contents,
+            bundle_name=None):
+        """Ensure parsing the given contents returns the expected values."""
+        name, services = bundles.parse_bundle(
+            contents, bundle_name=bundle_name)
+        self.assertEqual(expected_name, name)
+        self.assertEqual(set(expected_services), set(services))
+
+    def test_invalid_yaml(self):
+        # A ValueError is raised if the bundle contents are not a valid YAML.
+        with self.assertRaises(ValueError) as context_manager:
+            bundles.parse_bundle(':')
+        expected = 'unable to parse the bundle'
+        self.assertIn(expected, bytes(context_manager.exception))
+
+    def test_yaml_invalid_type(self):
+        # A ValueError is raised if the bundle contents are not well formed.
+        with self.assert_value_error('invalid YAML contents: a-string'):
+            bundles.parse_bundle('a-string')
+
+    def test_yaml_invalid_bundle_data(self):
+        # A ValueError is raised if bundles are not well formed.
+        contents = yaml.safe_dump({'mybundle': 'not valid'})
+        expected = 'invalid YAML contents: {mybundle: not valid}\n'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_yaml_no_service(self):
+        # A ValueError is raised if bundles do not include services.
+        contents = yaml.safe_dump({'mybundle': {}})
+        expected = 'invalid YAML contents: mybundle: {}\n'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_yaml_none_bundle_services(self):
+        # A ValueError is raised if services are None.
+        contents = yaml.safe_dump({'mybundle': {'services': None}})
+        expected = 'invalid YAML contents: mybundle: {services: null}\n'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_yaml_invalid_bundle_services_type(self):
+        # A ValueError is raised if services have an invalid type.
+        contents = yaml.safe_dump({'mybundle': {'services': 42}})
+        expected = 'invalid YAML contents: mybundle: {services: 42}\n'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_yaml_no_bundles(self):
+        # A ValueError is raised if the bundle contents are empty.
+        with self.assert_value_error('no bundles found'):
+            bundles.parse_bundle(yaml.safe_dump({}))
+
+    def test_bundle_name_not_specified(self):
+        # A ValueError is raised if the bundle name is not specified and the
+        # contents contain more than one bundle.
+        expected = ('multiple bundles found (bundle1, bundle2) '
+                    'but no bundle name specified')
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(self.valid_bundle)
+
+    def test_bundle_name_not_found(self):
+        # A ValueError is raised if the given bundle is not found in the file.
+        expected = ('bundle no-such not found in the provided list of bundles '
+                    '(bundle1, bundle2)')
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(self.valid_bundle, 'no-such')
+
+    def test_no_services(self):
+        # A ValueError is raised if the specified bundle does not contain
+        # services.
+        contents = yaml.safe_dump({'mybundle': {'services': {}}})
+        expected = 'bundle mybundle does not include any services'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_yaml_gui_in_services(self):
+        # A ValueError is raised if the bundle contains juju-gui.
+        contents = yaml.safe_dump({
+            'mybundle': {'services': {settings.JUJU_GUI_SERVICE_NAME: {}}},
+        })
+        expected = 'bundle mybundle contains an instance of juju-gui. ' \
+            'quickstart will install the latest version of the Juju GUI ' \
+            'automatically, please remove juju-gui from the bundle.'
+        with self.assert_value_error(expected):
+            bundles.parse_bundle(contents)
+
+    def test_success_no_name(self):
+        # The function succeeds when an implicit bundle name is used.
+        contents = yaml.safe_dump({
+            'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
+        })
+        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
+
+    def test_success_multiple_bundles(self):
+        # The function succeeds with multiple bundles.
+        self.assert_bundle(
+            'bundle2', ['django', 'nodejs'], self.valid_bundle, 'bundle2')
+
+    def test_success_json(self):
+        # Since JSON is a subset of YAML, the function also support JSON
+        # encoded bundles.
+        contents = json.dumps({
+            'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
+        })
+        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
 
=== added file 'quickstart/tests/test_jujutools.py'
--- quickstart/tests/test_jujutools.py	1970-01-01 00:00:00 +0000
+++ quickstart/tests/test_jujutools.py	2015-02-09 13:39:50 +0000
@@ -0,0 +1,204 @@
+# This file is part of the Juju Quickstart Plugin, which lets users set up a
+# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
+# Copyright (C) 2015 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 Quickstart Juju utilities and helpers."""
+
+from __future__ import unicode_literals
+
+import unittest
+
+import mock
+import yaml
+
+from quickstart import jujutools
+from quickstart.models import charms
+from quickstart.tests import helpers
+
+
+class TestGetServiceInfo(helpers.WatcherDataTestsMixin, unittest.TestCase):
+
+    def test_service_and_unit(self):
+        # The data about the given service and unit is correctly returned.
+        service_change = self.make_service_change()
+        unit_change = self.make_unit_change()
+        status = [service_change, unit_change]
+        expected = (service_change[2], unit_change[2])
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_service_only(self):
+        # The data about the given service without units is correctly returned.
+        service_change = self.make_service_change()
+        status = [service_change]
+        expected = (service_change[2], None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_service_removed(self):
+        # A tuple (None, None) is returned if the service is being removed.
+        status = [
+            self.make_service_change(action='remove'),
+            self.make_unit_change(),
+        ]
+        expected = (None, None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_another_service(self):
+        # A tuple (None, None) is returned if the service is not found.
+        status = [
+            self.make_service_change(data={'Name': 'another-service'}),
+            self.make_unit_change(),
+        ]
+        expected = (None, None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_service_not_alive(self):
+        # A tuple (None, None) is returned if the service is not alive.
+        status = [
+            self.make_service_change(data={'Life': 'dying'}),
+            self.make_unit_change(),
+        ]
+        expected = (None, None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_unit_removed(self):
+        # The unit data is not returned if the unit is being removed.
+        service_change = self.make_service_change()
+        status = [service_change, self.make_unit_change(action='remove')]
+        expected = (service_change[2], None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_another_unit(self):
+        # The unit data is not returned if the unit belongs to another service.
+        service_change = self.make_service_change()
+        status = [
+            service_change,
+            self.make_unit_change(data={'Service': 'another-service'}),
+        ]
+        expected = (service_change[2], None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_no_services(self):
+        # A tuple (None, None) is returned no services are found.
+        status = [self.make_unit_change()]
+        expected = (None, None)
+        self.assertEqual(
+            expected, jujutools.get_service_info(status, 'my-gui'))
+
+    def test_no_entities(self):
+        # A tuple (None, None) is returned no entities are found.
+        expected = (None, None)
+        self.assertEqual(expected, jujutools.get_service_info([], 'my-gui'))
+
+
[e-mail]('__builtin__.print', mock.Mock())
+class TestParseGuiCharmUrl(unittest.TestCase):
+
+    def test_charm_instance_returned(self):
+        # A charm instance is correctly returned.
+        charm = jujutools.parse_gui_charm_url('cs:trusty/juju-gui-42')
+        self.assertIsInstance(charm, charms.Charm)
+        self.assertEqual('cs:trusty/juju-gui-42', charm.url())
+
+    def test_customized(self):
+        # A customized charm URL is properly logged.
+        expected = 'using a customized juju-gui charm'
+        with helpers.assert_logs([expected], level='warn'):
+            jujutools.parse_gui_charm_url('cs:~juju-gui/precise/juju-gui-28')
+
+    def test_outdated(self):
+        # An outdated charm URL is properly logged.
+        expected = 'charm is outdated and may not support bundle deployments'
+        with helpers.assert_logs([expected], level='warn'):
+            jujutools.parse_gui_charm_url('cs:precise/juju-gui-1')
+
+    def test_unexpected(self):
+        # An unexpected charm URL is properly logged.
+        expected = (
+            'unexpected URL for the juju-gui charm: the service may not work '
+            'as expected')
+        with helpers.assert_logs([expected], level='warn'):
+            jujutools.parse_gui_charm_url('cs:precise/another-gui-42')
+
+    def test_official(self):
+        # No warnings are logged if an up to date charm is passed.
+        with mock.patch('logging.warn') as mock_warn:
+            jujutools.parse_gui_charm_url('cs:precise/juju-gui-100')
+        self.assertFalse(mock_warn.called)
+
+
+class TestParseStatusOutput(helpers.ValueErrorTestsMixin, unittest.TestCase):
+
+    def test_invalid_yaml(self):
+        # A ValueError is raised if the output is not a valid YAML.
+        with self.assertRaises(ValueError) as context_manager:
+            jujutools.parse_status_output(':')
+        expected = 'unable to parse the output'
+        self.assertIn(expected, bytes(context_manager.exception))
+
+    def test_invalid_yaml_contents(self):
+        # A ValueError is raised if the output is not well formed.
+        with self.assert_value_error('invalid YAML contents: a-string'):
+            jujutools.parse_status_output('a-string')
+
+    def test_no_agent_state(self):
+        # A ValueError is raised if the agent-state is not found in the YAML.
+        data = {
+            'machines': {
+                '0': {'agent-version': '1.17.0.1'},
+            },
+        }
+        expected = 'machines:0:agent-state not found in {}'.format(bytes(data))
+        with self.assert_value_error(expected):
+            jujutools.get_agent_state(yaml.safe_dump(data))
+
+    def test_success_agent_state(self):
+        # The agent state is correctly returned.
+        output = yaml.safe_dump({
+            'machines': {
+                '0': {'agent-version': '1.17.0.1', 'agent-state': 'started'},
+            },
+        })
+        agent_state = jujutools.get_agent_state(output)
+        self.assertEqual('started', agent_state)
+
+    def test_no_bootstrap_node_series(self):
+        # A ValueError is raised if the series is not found in the YAML.
+        data = {
+            'machines': {
+                '0': {'agent-version': '1.17.0.1'},
+            },
+        }
+        expected = 'machines:0:series not found in {}'.format(bytes(data))
+        with self.assert_value_error(expected):
+            jujutools.get_bootstrap_node_series(yaml.safe_dump(data))
+
+    def test_success_bootstrap_node_series(self):
+        # The bootstrap node series is correctly returned.
+        output = yaml.safe_dump({
+            'machines': {
+                '0': {'agent-version': '1.17.0.1',
+                      'agent-state': 'started',
+                      'series': 'zydeco'},
+            },
+        })
+        bsn_series = jujutools.get_bootstrap_node_series(output)
+        self.assertEqual('zydeco', bsn_series)
 
=== modified file 'quickstart/tests/test_utils.py'
--- quickstart/tests/test_utils.py	2014-11-11 19:08:57 +0000
+++ quickstart/tests/test_utils.py	2015-02-09 13:39:50 +0000
@@ -19,21 +19,17 @@
 from __future__ import unicode_literals
 
 import datetime
-import json
 import os
 import shutil
 import tempfile
 import unittest
 
 import mock
-import yaml
 
 from quickstart import (
     get_version,
-    settings,
     utils,
 )
-from quickstart.models import charms
 from quickstart.tests import helpers
 
 
@@ -153,155 +149,6 @@
             utils.call('echo', 'we are the borg!')
 
 
[e-mail]('__builtin__.print', mock.Mock())
-class TestParseGuiCharmUrl(unittest.TestCase):
-
-    def test_charm_instance_returned(self):
-        # A charm instance is correctly returned.
-        charm = utils.parse_gui_charm_url('cs:trusty/juju-gui-42')
-        self.assertIsInstance(charm, charms.Charm)
-        self.assertEqual('cs:trusty/juju-gui-42', charm.url())
-
-    def test_customized(self):
-        # A customized charm URL is properly logged.
-        expected = 'using a customized juju-gui charm'
-        with helpers.assert_logs([expected], level='warn'):
-            utils.parse_gui_charm_url('cs:~juju-gui/precise/juju-gui-28')
-
-    def test_outdated(self):
-        # An outdated charm URL is properly logged.
-        expected = 'charm is outdated and may not support bundle deployments'
-        with helpers.assert_logs([expected], level='warn'):
-            utils.parse_gui_charm_url('cs:precise/juju-gui-1')
-
-    def test_unexpected(self):
-        # An unexpected charm URL is properly logged.
-        expected = (
-            'unexpected URL for the juju-gui charm: the service may not work '
-            'as expected')
-        with helpers.assert_logs([expected], level='warn'):
-            utils.parse_gui_charm_url('cs:precise/another-gui-42')
-
-    def test_official(self):
-        # No warnings are logged if an up to date charm is passed.
-        with mock.patch('logging.warn') as mock_warn:
-            utils.parse_gui_charm_url('cs:precise/juju-gui-100')
-        self.assertFalse(mock_warn.called)
-
-
-class TestConvertBundleUrl(helpers.ValueErrorTestsMixin, unittest.TestCase):
-
-    def test_full_bundle_url(self):
-        # The HTTPS location to the YAML contents is correctly returned.
-        bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki'
-        url, bundle_id = utils.convert_bundle_url(bundle_url)
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
-        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
-
-    def test_bundle_url_right_strip(self):
-        # The trailing slash in the bundle URL is removed.
-        bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki/'
-        url, bundle_id = utils.convert_bundle_url(bundle_url)
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
-        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
-
-    def test_bundle_url_no_revision(self):
-        # The bundle revision is optional.
-        bundle_url = 'bundle:~myuser/wiki-bundle/wiki-simple'
-        url, bundle_id = utils.convert_bundle_url(bundle_url)
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~myuser/wiki-bundle/wiki-simple/json', url)
-        self.assertEqual('~myuser/wiki-bundle/wiki-simple', bundle_id)
-
-    def test_bundle_url_no_user(self):
-        # If the bundle user is not specified, the bundle is assumed to be
-        # promulgated and owned by "charmers".
-        bundle_url = 'bundle:wiki-bundle/1/wiki'
-        url, bundle_id = utils.convert_bundle_url(bundle_url)
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~charmers/wiki-bundle/1/wiki/json', url)
-        self.assertEqual('~charmers/wiki-bundle/1/wiki', bundle_id)
-
-    def test_bundle_url_short_form(self):
-        # A promulgated bundle URL can just include the basket and the name.
-        bundle_url = 'bundle:wiki-bundle/wiki'
-        url, bundle_id = utils.convert_bundle_url(bundle_url)
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~charmers/wiki-bundle/wiki/json', url)
-        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
-
-    def test_full_jujucharms_url(self):
-        # The HTTPS location to the YAML contents is correctly returned.
-        url, bundle_id = utils.convert_bundle_url(
-            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki-bundle/42/wiki')
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
-        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
-
-    def test_jujucharms_url_right_strip(self):
-        # The trailing slash in the jujucharms URL is removed.
-        url, bundle_id = utils.convert_bundle_url(
-            settings.JUJUCHARMS_BUNDLE_URL + '~charmers/mediawiki/6/scalable/')
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~charmers/mediawiki/6/scalable/json', url)
-        self.assertEqual('~charmers/mediawiki/6/scalable', bundle_id)
-
-    def test_jujucharms_url_no_revision(self):
-        # The bundle revision is optional.
-        url, bundle_id = utils.convert_bundle_url(
-            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki/wiki-simple/')
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~myuser/wiki/wiki-simple/json', url)
-        self.assertEqual('~myuser/wiki/wiki-simple', bundle_id)
-
-    def test_jujucharms_url_no_user(self):
-        # If the bundle user is not specified, the bundle is assumed to be
-        # promulgated and owned by "charmers".
-        url, bundle_id = utils.convert_bundle_url(
-            settings.JUJUCHARMS_BUNDLE_URL + 'mediawiki/42/single/')
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~charmers/mediawiki/42/single/json', url)
-        self.assertEqual('~charmers/mediawiki/42/single', bundle_id)
-
-    def test_jujucharms_url_short_form(self):
-        # A jujucharms URL for a promulgated bundle can just include the basket
-        # and the name.
-        url, bundle_id = utils.convert_bundle_url(
-            settings.JUJUCHARMS_BUNDLE_URL + 'wiki-bundle/wiki/')
-        self.assertEqual(
-            'https://manage.jujucharms.com'
-            '/bundle/~charmers/wiki-bundle/wiki/json', url)
-        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
-
-    def test_error(self):
-        # A ValueError is raised if the bundle/jujucharms URL is not valid.
-        bad_urls = (
-            'bad', 'bundle:', 'bundle:~user', 'bundle:no-such',
-            'bundle:~user/name', 'bundle:~user/basket/revision/name',
-            'bundle:basket/name//', 'bundle:basket.name/bundle.name',
-            settings.JUJUCHARMS_BUNDLE_URL,
-            settings.JUJUCHARMS_BUNDLE_URL + 'bad',
-            settings.JUJUCHARMS_BUNDLE_URL + '~user/no-such',
-            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/revision/name/',
-            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/42/name/error',
-            'https://jujucharms.com/charms/mediawiki/simple/',
-        )
-        for url in bad_urls:
-            with self.assert_value_error('invalid bundle URL: {}'.format(url)):
-                utils.convert_bundle_url(url)
-
-
 class TestGetQuickstartBanner(unittest.TestCase):
 
     def patch_datetime(self):
@@ -321,79 +168,6 @@
         self.assertEqual(expected, obtained)
 
 
-class TestGetServiceInfo(helpers.WatcherDataTestsMixin, unittest.TestCase):
-
-    def test_service_and_unit(self):
-        # The data about the given service and unit is correctly returned.
-        service_change = self.make_service_change()
-        unit_change = self.make_unit_change()
-        status = [service_change, unit_change]
-        expected = (service_change[2], unit_change[2])
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_service_only(self):
-        # The data about the given service without units is correctly returned.
-        service_change = self.make_service_change()
-        status = [service_change]
-        expected = (service_change[2], None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_service_removed(self):
-        # A tuple (None, None) is returned if the service is being removed.
-        status = [
-            self.make_service_change(action='remove'),
-            self.make_unit_change(),
-        ]
-        expected = (None, None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_another_service(self):
-        # A tuple (None, None) is returned if the service is not found.
-        status = [
-            self.make_service_change(data={'Name': 'another-service'}),
-            self.make_unit_change(),
-        ]
-        expected = (None, None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_service_not_alive(self):
-        # A tuple (None, None) is returned if the service is not alive.
-        status = [
-            self.make_service_change(data={'Life': 'dying'}),
-            self.make_unit_change(),
-        ]
-        expected = (None, None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_unit_removed(self):
-        # The unit data is not returned if the unit is being removed.
-        service_change = self.make_service_change()
-        status = [service_change, self.make_unit_change(action='remove')]
-        expected = (service_change[2], None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_another_unit(self):
-        # The unit data is not returned if the unit belongs to another service.
-        service_change = self.make_service_change()
-        status = [
-            service_change,
-            self.make_unit_change(data={'Service': 'another-service'}),
-        ]
-        expected = (service_change[2], None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_no_services(self):
-        # A tuple (None, None) is returned no services are found.
-        status = [self.make_unit_change()]
-        expected = (None, None)
-        self.assertEqual(expected, utils.get_service_info(status, 'my-gui'))
-
-    def test_no_entities(self):
-        # A tuple (None, None) is returned no entities are found.
-        expected = (None, None)
-        self.assertEqual(expected, utils.get_service_info([], 'my-gui'))
-
-
 class TestGetUbuntuCodename(helpers.CallTestsMixin, unittest.TestCase):
 
     def test_codename(self):
@@ -461,177 +235,6 @@
         self.assertFalse(os.path.exists(path))
 
 
-class TestParseBundle(
-        helpers.BundleFileTestsMixin, helpers.ValueErrorTestsMixin,
-        unittest.TestCase):
-
-    def assert_bundle(
-            self, expected_name, expected_services, contents,
-            bundle_name=None):
-        """Ensure parsing the given contents returns the expected values."""
-        name, services = utils.parse_bundle(contents, bundle_name=bundle_name)
-        self.assertEqual(expected_name, name)
-        self.assertEqual(set(expected_services), set(services))
-
-    def test_invalid_yaml(self):
-        # A ValueError is raised if the bundle contents are not a valid YAML.
-        with self.assertRaises(ValueError) as context_manager:
-            utils.parse_bundle(':')
-        expected = 'unable to parse the bundle'
-        self.assertIn(expected, bytes(context_manager.exception))
-
-    def test_yaml_invalid_type(self):
-        # A ValueError is raised if the bundle contents are not well formed.
-        with self.assert_value_error('invalid YAML contents: a-string'):
-            utils.parse_bundle('a-string')
-
-    def test_yaml_invalid_bundle_data(self):
-        # A ValueError is raised if bundles are not well formed.
-        contents = yaml.safe_dump({'mybundle': 'not valid'})
-        expected = 'invalid YAML contents: {mybundle: not valid}\n'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_yaml_no_service(self):
-        # A ValueError is raised if bundles do not include services.
-        contents = yaml.safe_dump({'mybundle': {}})
-        expected = 'invalid YAML contents: mybundle: {}\n'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_yaml_none_bundle_services(self):
-        # A ValueError is raised if services are None.
-        contents = yaml.safe_dump({'mybundle': {'services': None}})
-        expected = 'invalid YAML contents: mybundle: {services: null}\n'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_yaml_invalid_bundle_services_type(self):
-        # A ValueError is raised if services have an invalid type.
-        contents = yaml.safe_dump({'mybundle': {'services': 42}})
-        expected = 'invalid YAML contents: mybundle: {services: 42}\n'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_yaml_no_bundles(self):
-        # A ValueError is raised if the bundle contents are empty.
-        with self.assert_value_error('no bundles found'):
-            utils.parse_bundle(yaml.safe_dump({}))
-
-    def test_bundle_name_not_specified(self):
-        # A ValueError is raised if the bundle name is not specified and the
-        # contents contain more than one bundle.
-        expected = ('multiple bundles found (bundle1, bundle2) '
-                    'but no bundle name specified')
-        with self.assert_value_error(expected):
-            utils.parse_bundle(self.valid_bundle)
-
-    def test_bundle_name_not_found(self):
-        # A ValueError is raised if the given bundle is not found in the file.
-        expected = ('bundle no-such not found in the provided list of bundles '
-                    '(bundle1, bundle2)')
-        with self.assert_value_error(expected):
-            utils.parse_bundle(self.valid_bundle, 'no-such')
-
-    def test_no_services(self):
-        # A ValueError is raised if the specified bundle does not contain
-        # services.
-        contents = yaml.safe_dump({'mybundle': {'services': {}}})
-        expected = 'bundle mybundle does not include any services'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_yaml_gui_in_services(self):
-        # A ValueError is raised if the bundle contains juju-gui.
-        contents = yaml.safe_dump({
-            'mybundle': {'services': {settings.JUJU_GUI_SERVICE_NAME: {}}},
-        })
-        expected = 'bundle mybundle contains an instance of juju-gui. ' \
-            'quickstart will install the latest version of the Juju GUI ' \
-            'automatically, please remove juju-gui from the bundle.'
-        with self.assert_value_error(expected):
-            utils.parse_bundle(contents)
-
-    def test_success_no_name(self):
-        # The function succeeds when an implicit bundle name is used.
-        contents = yaml.safe_dump({
-            'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
-        })
-        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
-
-    def test_success_multiple_bundles(self):
-        # The function succeeds with multiple bundles.
-        self.assert_bundle(
-            'bundle2', ['django', 'nodejs'], self.valid_bundle, 'bundle2')
-
-    def test_success_json(self):
-        # Since JSON is a subset of YAML, the function also support JSON
-        # encoded bundles.
-        contents = json.dumps({
-            'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
-        })
-        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
-
-
-class TestParseStatusOutput(helpers.ValueErrorTestsMixin, unittest.TestCase):
-
-    def test_invalid_yaml(self):
-        # A ValueError is raised if the output is not a valid YAML.
-        with self.assertRaises(ValueError) as context_manager:
-            utils.parse_status_output(':')
-        expected = 'unable to parse the output'
-        self.assertIn(expected, bytes(context_manager.exception))
-
-    def test_invalid_yaml_contents(self):
-        # A ValueError is raised if the output is not well formed.
-        with self.assert_value_error('invalid YAML contents: a-string'):
-            utils.parse_status_output('a-string')
-
-    def test_no_agent_state(self):
-        # A ValueError is raised if the agent-state is not found in the YAML.
-        data = {
-            'machines': {
-                '0': {'agent-version': '1.17.0.1'},
-            },
-        }
-        expected = 'machines:0:agent-state not found in {}'.format(bytes(data))
-        with self.assert_value_error(expected):
-            utils.get_agent_state(yaml.safe_dump(data))
-
-    def test_success_agent_state(self):
-        # The agent state is correctly returned.
-        output = yaml.safe_dump({
-            'machines': {
-                '0': {'agent-version': '1.17.0.1', 'agent-state': 'started'},
-            },
-        })
-        agent_state = utils.get_agent_state(output)
-        self.assertEqual('started', agent_state)
-
-    def test_no_bootstrap_node_series(self):
-        # A ValueError is raised if the series is not found in the YAML.
-        data = {
-            'machines': {
-                '0': {'agent-version': '1.17.0.1'},
-            },
-        }
-        expected = 'machines:0:series not found in {}'.format(bytes(data))
-        with self.assert_value_error(expected):
-            utils.get_bootstrap_node_series(yaml.safe_dump(data))
-
-    def test_success_bootstrap_node_series(self):
-        # The bootstrap node series is correctly returned.
-        output = yaml.safe_dump({
-            'machines': {
-                '0': {'agent-version': '1.17.0.1',
-                      'agent-state': 'started',
-                      'series': 'zydeco'},
-            },
-        })
-        bsn_series = utils.get_bootstrap_node_series(output)
-        self.assertEqual('zydeco', bsn_series)
-
-
 class TestRunOnce(unittest.TestCase):
 
     def setUp(self):
 
=== modified file 'quickstart/utils.py'
--- quickstart/utils.py	2014-11-11 19:08:57 +0000
+++ quickstart/utils.py	2015-02-09 13:39:50 +0000
@@ -14,41 +14,22 @@
 # 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/>.
 
-"""Juju Quickstart utility functions and classes."""
+"""Juju Quickstart general purpose utility functions and classes."""
 
 from __future__ import (
     print_function,
     unicode_literals,
 )
 
-import collections
 import datetime
 import errno
 import functools
 import logging
 import os
 import pipes
-import re
 import subprocess
 
 import quickstart
-from quickstart import (
-    serializers,
-    settings,
-)
-from quickstart.models import charms
-
-
-# Compile the regular expression used to parse bundle URLs.
-_bundle_expression = re.compile(r"""
-    # Bundle schema or bundle URL namespace on jujucharms.com.
-    ^(?:bundle:|{})
-    (?:~([-\w]+)/)?  # Optional user name.
-    ([-\w]+)/  # Basket name.
-    (?:(\d+)/)?  # Optional bundle revision number.
-    ([-\w]+)  # Bundle name.
-    /?$  # Optional trailing slash.
-""".format(settings.JUJUCHARMS_BUNDLE_URL), re.VERBOSE)
 
 
 def add_apt_repository(repository):
@@ -101,51 +82,6 @@
     return retcode, output.decode('utf-8'), error.decode('utf-8')
 
 
-def parse_gui_charm_url(charm_url):
-    """Parse the given charm URL.
-
-    Check if the charm looks like a Juju GUI charm.
-    Print (to stdout or to logs) info and warnings about the charm URL.
-
-    Return the parsed charm object as an instance of
-    quickstart.models.charms.Charm.
-    """
-    print('charm URL: {}'.format(charm_url))
-    charm = charms.Charm.from_url(charm_url)
-    charm_name = settings.JUJU_GUI_CHARM_NAME
-    if charm.name != charm_name:
-        # This does not seem to be a Juju GUI charm.
-        logging.warn(
-            'unexpected URL for the {} charm: '
-            'the service may not work as expected'.format(charm_name))
-        return charm
-    if charm.user or charm.is_local():
-        # This is not the official Juju GUI charm.
-        logging.warn('using a customized {} charm'.format(charm_name))
-    elif charm.revision < settings.MINIMUM_REVISIONS_FOR_BUNDLES[charm.series]:
-        # This is the official Juju GUI charm, but it is outdated.
-        logging.warn(
-            'charm is outdated and may not support bundle deployments')
-    return charm
-
-
-def convert_bundle_url(bundle_url):
-    """Return the equivalent YAML HTTPS location for the given bundle URL.
-
-    Raise a ValueError if the given URL is not a valid bundle URL.
-    """
-    match = _bundle_expression.match(bundle_url)
-    if match is None:
-        msg = 'invalid bundle URL: {}'.format(bundle_url)
-        raise ValueError(msg.encode('utf-8'))
-    user, basket, revision, name = match.groups()
-    user_part = '~charmers/' if user is None else '~{}/'.format(user)
-    revision_part = '' if revision is None else '{}/'.format(revision)
-    bundle_id = '{}{}/{}{}'.format(user_part, basket, revision_part, name)
-    return ('https://manage.jujucharms.com/bundle/{}/json'.format(bundle_id),
-            bundle_id)
-
-
 def get_quickstart_banner():
     """Return a quickstart banner suitable for being included in files.
 
@@ -162,31 +98,6 @@
         '# at {} UTC.\n\n'.format(version, formatted_date))
 
 
-def get_service_info(status, service_name):
-    """Retrieve information on the given service and on its first alive unit.
-
-    Return a tuple containing two values: (service data, unit data).
-    Each value can be:
-        - a dictionary of data about the given entity (service or unit) as
-          returned by the Juju watcher;
-        - None, if the entity is not present in the Juju environment.
-    If the service data is None, the unit data is always None.
-    """
-    services = [
-        data for entity, action, data in status if
-        (entity == 'service') and (action != 'remove') and
-        (data['Name'] == service_name) and (data['Life'] == 'alive')
-    ]
-    if not services:
-        return None, None
-    units = [
-        data for entity, action, data in status if
-        entity == 'unit' and action != 'remove' and
-        data['Service'] == service_name
-    ]
-    return services[0], units[0] if units else None
-
-
 def get_ubuntu_codename():
     """Return the codename of the current Ubuntu release (e.g. "trusty").
 
@@ -213,112 +124,6 @@
             raise
 
 
-def parse_bundle(bundle_yaml, bundle_name=None):
-    """Parse the provided bundle YAML encoded contents.
-
-    Since a valid JSON is a subset of YAML this function can be used also to
-    parse JSON encoded contents.
-
-    Return a tuple containing the bundle name and the list of services included
-    in the bundle.
-
-    Raise a ValueError if:
-      - the bundle YAML contents are not parsable by YAML;
-      - the YAML contents are not properly structured;
-      - the bundle name is specified but not included in the bundle file;
-      - the bundle name is not specified and the bundle file includes more than
-        one bundle;
-      - the bundle does not include services.
-    """
-    # Parse the bundle file.
-    try:
-        bundles = serializers.yaml_load(bundle_yaml)
-    except Exception as err:
-        msg = b'unable to parse the bundle: {}'.format(err)
-        raise ValueError(msg)
-    # Ensure the bundle file is well formed and contains at least one bundle.
-    if not isinstance(bundles, collections.Mapping):
-        msg = 'invalid YAML contents: {}'.format(bundle_yaml)
-        raise ValueError(msg.encode('utf-8'))
-    try:
-        name_services_map = dict(
-            (key, value['services'].keys())
-            for key, value in bundles.items()
-        )
-    except (AttributeError, KeyError, TypeError):
-        msg = 'invalid YAML contents: {}'.format(bundle_yaml)
-        raise ValueError(msg.encode('utf-8'))
-    if not name_services_map:
-        raise ValueError(b'no bundles found')
-    # Retrieve the bundle name and services.
-    if bundle_name is None:
-        if len(name_services_map) > 1:
-            msg = 'multiple bundles found ({}) but no bundle name specified'
-            bundle_names = ', '.join(sorted(name_services_map.keys()))
-            raise ValueError(msg.format(bundle_names).encode('utf-8'))
-        bundle_name, bundle_services = name_services_map.items()[0]
-    else:
-        bundle_services = name_services_map.get(bundle_name)
-        if bundle_services is None:
-            msg = 'bundle {} not found in the provided list of bundles ({})'
-            bundle_names = ', '.join(sorted(name_services_map.keys()))
-            raise ValueError(
-                msg.format(bundle_name, bundle_names).encode('utf-8'))
-    if not bundle_services:
-        msg = 'bundle {} does not include any services'.format(bundle_name)
-        raise ValueError(msg.encode('utf-8'))
-    if settings.JUJU_GUI_SERVICE_NAME in bundle_services:
-        msg = ('bundle {} contains an instance of juju-gui. quickstart will '
-               'install the latest version of the Juju GUI automatically, '
-               'please remove juju-gui from the bundle.'.format(bundle_name))
-        raise ValueError(msg.encode('utf-8'))
-    return bundle_name, bundle_services
-
-
-def parse_status_output(output, keys=None):
-    """Parse the output of juju status.
-
-    Return selection specified by the keys array.
-    Raise a ValueError if the selection cannot be retrieved.
-    """
-    if keys is None:
-        keys = ['dummy']
-    try:
-        status = serializers.yaml_load(output)
-    except Exception as err:
-        raise ValueError(b'unable to parse the output: {}'.format(err))
-
-    selection = status
-    for key in keys:
-        try:
-            selection = selection.get(key, {})
-        except AttributeError as err:
-            msg = 'invalid YAML contents: {}'.format(status)
-            raise ValueError(msg.encode('utf-8'))
-    if selection == {}:
-        msg = '{} not found in {}'.format(':'.join(keys), status)
-        raise ValueError(msg.encode('utf-8'))
-    return selection
-
-
-def get_agent_state(output):
-    """Parse the output of juju status for the agent state.
-
-    Return the agent state.
-    Raise a ValueError if the agent state cannot be retrieved.
-    """
-    return parse_status_output(output, ['machines', '0', 'agent-state'])
-
-
-def get_bootstrap_node_series(output):
-    """Parse the output of juju status for the agent state.
-
-    Return the agent state.
-    Raise a ValueError if the agent state cannot be retrieved.
-    """
-    return parse_status_output(output, ['machines', '0', 'series'])
-
-
 def get_juju_version(juju_command):
     """Return the current juju-core version.