Merge lp:~frankban/juju-quickstart/interactive-jenvs into lp:juju-quickstart

[Francesco Banconi]

Display the jenv environments in interactive mode.

The jenv environments are now displayed in the
interactive session, and it's possible to use them.

Also implemented a simple jenv detail view in uwrid.

Quickstart now also supports highlighting active
environments, i.e. those that are supposed to be
running because they have a corresponding jenv file
in the juju gome.

Tests: `make check`.

QA:
user the new juju, bootstrap one or more environments
with quickstart (use .venv/bin/python juju-quickstart --upload-tools
if you are using a non-local provider).
Start the interactive session, and check those environments are
properly marked as acrive.
Run quickstart again to check it is idempotent.
Create new users and copy the resulting jenv file to ~/.juju/environments/.
Run quickstart interactive session again, and check the
new environments are reported, and it is possible to use them.

https://codereview.appspot.com/188330043/

[Francesco Banconi (frankban)]

Reviewers: mp+244976_code.launchpad.net,

Message:
Please take a look.

Description:
Display the jenv environments in interactive mode.

The jenv environments are now displayed in the
interactive session, and it's possible to use them.

Also implemented a simple jenv detail view in uwrid.

Quickstart now also supports highlighting active
environments, i.e. those that are supposed to be
running because they have a corresponding jenv file
in the juju gome.

Tests: `make check`.

QA:
user the new juju, bootstrap one or more environments
with quickstart (use .venv/bin/python juju-quickstart --upload-tools
if you are using a non-local provider).
Start the interactive session, and check those environments are
properly marked as acrive.
Run quickstart again to check it is idempotent.
Create new users and copy the resulting jenv file to
~/.juju/environments/.
Run quickstart interactive session again, and check the
new environments are reported, and it is possible to use them.

https://code.launchpad.net/~frankban/juju-quickstart/interactive-jenvs/+merge/244976

(do not edit description out of merge proposal)

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

Affected files (+530, -104 lines):
   A [revision details]
   M quickstart/cli/ui.py
   M quickstart/cli/views.py
   M quickstart/manage.py
   M quickstart/models/jenv.py
   M quickstart/tests/cli/test_views.py
   M quickstart/tests/helpers.py
   M quickstart/tests/models/test_jenv.py
   M quickstart/tests/test_manage.py

[Richard Harding (rharding)]

LGTM no qa

https://codereview.appspot.com/188330043/

[j.c.sackett (jcsackett)]

LGTM, Franceso. Just one question, and it's not directly related to your
branch.

https://codereview.appspot.com/188330043/diff/1/quickstart/tests/helpers.py
File quickstart/tests/helpers.py (right):

https://codereview.appspot.com/188330043/diff/1/quickstart/tests/helpers.py#newcode266
quickstart/tests/helpers.py:266: 'type': '__unknown__',
This isn't from your branch, but why are we listing ec2 as an "unknown"?

https://codereview.appspot.com/188330043/

[Francesco Banconi (frankban)]

Thanks for the reviews!

https://codereview.appspot.com/188330043/diff/1/quickstart/tests/helpers.py
File quickstart/tests/helpers.py (right):

https://codereview.appspot.com/188330043/diff/1/quickstart/tests/helpers.py#newcode266
quickstart/tests/helpers.py:266: 'type': '__unknown__',
On 2014/12/17 16:13:07, j.c.sackett wrote:
> This isn't from your branch, but why are we listing ec2 as an
"unknown"?

All the jenv files created by "juju user add" don't include the provider
type. So the type can be unknown even if the name suggests a specific
provider.

https://codereview.appspot.com/188330043/

[j.c.sackett (jcsackett)]

QA notes:

I ran juju-quickstart -i locally.

I saw my ec2 setup with a check, as it is default.
My two local envs were listed, with the active one showing a green
bullet.
My manual provider env was listed with nothing special, as expected.

I simlinked the juju ci jenv into my environments; it was listed as an
imported environment, and I could see its details once selected.

QA OK.

https://codereview.appspot.com/188330043/

[Francesco Banconi (frankban)]

*** Submitted:

Display the jenv environments in interactive mode.

The jenv environments are now displayed in the
interactive session, and it's possible to use them.

Also implemented a simple jenv detail view in uwrid.

Quickstart now also supports highlighting active
environments, i.e. those that are supposed to be
running because they have a corresponding jenv file
in the juju gome.

Tests: `make check`.

QA:
user the new juju, bootstrap one or more environments
with quickstart (use .venv/bin/python juju-quickstart --upload-tools
if you are using a non-local provider).
Start the interactive session, and check those environments are
properly marked as acrive.
Run quickstart again to check it is idempotent.
Create new users and copy the resulting jenv file to
~/.juju/environments/.
Run quickstart interactive session again, and check the
new environments are reported, and it is possible to use them.

R=rharding, j.c.sackett
CC=
https://codereview.appspot.com/188330043

https://codereview.appspot.com/188330043/

=== modified file 'quickstart/cli/ui.py'
--- quickstart/cli/ui.py	2014-01-07 15:41:55 +0000
+++ quickstart/cli/ui.py	2014-12-17 12:34:18 +0000
@@ -31,6 +31,8 @@
     # See <http://excess.org/urwid/docs/reference/constants.html
     # foreground-and-background-colors>.
     (None, 'light gray', 'black'),
+    ('active', 'light green', 'black'),
+    ('active status', 'dark green', 'light gray'),
     ('dialog', 'dark gray', 'light gray'),
     ('dialog header', 'light gray,bold', 'dark blue'),
     ('control alert', 'light red', 'light gray'),
 
=== modified file 'quickstart/cli/views.py'
--- quickstart/cli/views.py	2014-11-10 14:11:11 +0000
+++ quickstart/cli/views.py	2014-12-17 12:34:18 +0000
@@ -115,7 +115,10 @@
     forms,
     ui,
 )
-from quickstart.models import envs
+from quickstart.models import (
+    envs,
+    jenv,
+)
 
 
 def show(view, *args):
@@ -152,7 +155,7 @@
     raise ui.AppExit((env_db, env_data))
 
 
-def env_index(app, env_type_db, env_db, save_callable):
+def env_index(app, env_type_db, env_db, jenv_db, save_callable):
     """Show the Juju environments list.
 
     The env_detail view is displayed when the user clicks on an environment.
@@ -162,17 +165,22 @@
     Receives:
         - env_type_db: the environments meta information;
         - env_db: the environments database;
+        - jenv_db: the jenv files database;
         - save_callable: a function called to save a new environment database.
     """
+    # XXX frankban 16/12/2014: this function is too long, subdivide it.
     env_db = copy.deepcopy(env_db)
+    jenv_db = copy.deepcopy(jenv_db)
     # All the environment views return a tuple (new_env_db, env_data).
     # Set the env_data to None in the case the user quits the application
     # without selecting an environment to use.
     app.set_return_value_on_exit((env_db, None))
     detail_view = functools.partial(
-        env_detail, app, env_type_db, env_db, save_callable)
+        env_detail, app, env_type_db, env_db, jenv_db, save_callable)
+    jenv_view = functools.partial(
+        jenv_detail, app, env_type_db, env_db, jenv_db, save_callable)
     edit_view = functools.partial(
-        env_edit, app, env_type_db, env_db, save_callable)
+        env_edit, app, env_type_db, env_db, jenv_db, save_callable)
     # Alphabetically sort the existing environments.
     environments = sorted([
         envs.get_env_data(env_db, env_name)
@@ -269,8 +277,9 @@
     # "juju status" for each environment in the list, which is expensive and
     # time consuming.
     focus_position = None
-    errors_found = default_found = False
+    active_found = default_found = errors_found = False
     existing_widgets_num = len(widgets)
+    remaining_jenv_db = copy.deepcopy(jenv_db)
     for position, env_data in enumerate(environments):
         bullet = '\N{BULLET}'
         # Is this environment the default one?
@@ -279,22 +288,48 @@
             # The first two positions are the section header and the divider.
             focus_position = position + existing_widgets_num
             bullet = '\N{CHECK MARK}'
-        # Is this environment valid?
-        env_metadata = envs.get_env_metadata(env_type_db, env_data)
-        errors = envs.validate(env_metadata, env_data)
-        if errors:
-            errors_found = True
-            bullet = ('error', bullet)
+        if remaining_jenv_db['environments'].pop(env_data['name'], None):
+            # This is an active environment. Is it running? Who knows...
+            active_found = True
+            bullet = ('active', bullet)
+        else:
+            # Check if this environment is valid.
+            env_metadata = envs.get_env_metadata(env_type_db, env_data)
+            errors = envs.validate(env_metadata, env_data)
+            if errors:
+                errors_found = True
+                bullet = ('error', bullet)
         # Create a label for the environment.
         env_short_description = envs.get_env_short_description(env_data)
         text = [bullet, ' {}'.format(env_short_description)]
         widgets.append(ui.MenuButton(text, ui.thunk(detail_view, env_data)))
 
+    # Alphabetically sort the remaining environments not included in the
+    # environments.yaml file.
+    environments = sorted([
+        envs.get_env_data(remaining_jenv_db, env_name)
+        for env_name in remaining_jenv_db['environments']
+    ], key=operator.itemgetter('name'))
+
+    # List the remaining active environments. Those environments are not
+    # included in the environments.yaml file: they are probably imported and
+    # supposed to be working/active. The user has the ability to select them.
+    widgets.extend([
+        urwid.Divider(),
+        urwid.Text(('highlight', 'Other active environments')),
+        urwid.Text('(imported/not included in your environments.yaml file):'),
+        urwid.Divider(),
+    ])
+    bullet = ('active', '\N{BULLET}')
+    for env_data in environments:
+        env_short_description = jenv.get_env_short_description(env_data)
+        text = [bullet, ' {}'.format(env_short_description)]
+        widgets.append(ui.MenuButton(text, ui.thunk(jenv_view, env_data)))
+
     # Set up the "create a new environment" section.
     widgets.extend([
         urwid.Divider(),
-        urwid.Text((
-            'highlight', 'Create a new environment:')),
+        urwid.Text(('highlight', 'Create a new environment:')),
         urwid.Divider(),
     ])
     # The Juju GUI can be safely installed in the bootstrap node only if its
@@ -322,6 +357,8 @@
     status = [' \N{UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW} navigate ']
     if default_found:
         status.append(' \N{CHECK MARK} default ')
+    if active_found:
+        status.extend([('active status', ' \N{BULLET}'), ' active '])
     if errors_found:
         status.extend([('error status', ' \N{BULLET}'), ' has errors '])
     app.set_status(status)
@@ -332,7 +369,7 @@
     app.set_contents(contents)
 
 
-def env_detail(app, env_type_db, env_db, save_callable, env_data):
+def env_detail(app, env_type_db, env_db, jenv_db, save_callable, env_data):
     """Show details on a Juju environment.
 
     From this view it is possible to start the environment, set it as default,
@@ -341,18 +378,20 @@
     Receives:
         - env_type_db: the environments meta information;
         - env_db: the environments database;
+        - jenv_db: the jenv files database;
         - save_callable: a function called to save a new environment database;
         - env_data: the environment data.
     """
     env_db = copy.deepcopy(env_db)
+    jenv_db = copy.deepcopy(jenv_db)
     # All the environment views return a tuple (new_env_db, env_data).
     # Set the env_data to None in the case the user quits the application
     # without selecting an environment to use.
     app.set_return_value_on_exit((env_db, None))
     index_view = functools.partial(
-        env_index, app, env_type_db, env_db, save_callable)
+        env_index, app, env_type_db, env_db, jenv_db, save_callable)
     edit_view = functools.partial(
-        env_edit, app, env_type_db, env_db, save_callable, env_data)
+        env_edit, app, env_type_db, env_db, jenv_db, save_callable, env_data)
 
     def use(env_data):
         # Quit the interactive session returning the (possibly modified)
@@ -425,7 +464,62 @@
     app.set_contents(listbox)
 
 
-def env_edit(app, env_type_db, env_db, save_callable, env_data):
+def jenv_detail(app, env_type_db, env_db, jenv_db, save_callable, env_data):
+    """Show details on a Juju imported environment.
+
+    The environment is not included in the environments.yaml file, but just
+    found in the jenv database.
+    From this view it is possible to start the environment.
+
+    Receives:
+        - env_type_db: the environments meta information;
+        - env_db: the environments database;
+        - jenv_db: the jenv files database;
+        - save_callable: a function called to save a new environment database;
+        - env_data: the environment data.
+    """
+    env_db = copy.deepcopy(env_db)
+    jenv_db = copy.deepcopy(jenv_db)
+    # All the environment views return a tuple (new_env_db, env_data).
+    # Set the env_data to None in the case the user quits the application
+    # without selecting an environment to use.
+    app.set_return_value_on_exit((env_db, None))
+    index_view = functools.partial(
+        env_index, app, env_type_db, env_db, jenv_db, save_callable)
+
+    def use(env_data):
+        # Quit the interactive session returning the (possibly modified)
+        # environment database and the environment data corresponding to the
+        # selected environment.
+        raise ui.AppExit((env_db, env_data))
+
+    app.set_title(jenv.get_env_short_description(env_data))
+    widgets = []
+    for key, value in jenv.get_env_details(env_data):
+        widgets.append(urwid.Text(['{}: '.format(key), ('highlight', value)]))
+    widgets.extend([
+        urwid.Divider(),
+        urwid.Text([
+            ('highlight', 'Imported active environment.\n'),
+            'This environment is not included in your environments.yaml file.'
+            '\nFor this reason, it is not possible to edit or remove it.\n'
+            'However, you can use the link below to ',
+            ('highlight', 'use Juju Quickstart'),
+            ' with this environment.',
+        ]),
+    ])
+
+    controls = [
+        ui.MenuButton('back', ui.thunk(index_view)),
+        ui.MenuButton('use', ui.thunk(use, env_data)),
+    ]
+    widgets.append(ui.create_controls(*controls))
+    listbox = urwid.ListBox(urwid.SimpleFocusListWalker(widgets))
+    app.set_contents(listbox)
+    app.set_status([' \N{RIGHTWARDS ARROW OVER LEFTWARDS ARROW} navigate '])
+
+
+def env_edit(app, env_type_db, env_db, jenv_db, save_callable, env_data):
     """Create or modify a Juju environment.
 
     This view displays an edit form allowing for environment
@@ -435,6 +529,7 @@
     Receives:
         - env_type_db: the environments meta information;
         - env_db: the environments database;
+        - jenv_db: the jenv files database;
         - save_callable: a function called to save a new environment database;
         - env_data: the environment data.
 
@@ -444,15 +539,16 @@
     env_data includes the "name" key and all the other environment info.
     """
     env_db = copy.deepcopy(env_db)
+    jenv_db = copy.deepcopy(jenv_db)
     # All the environment views return a tuple (new_env_db, env_data).
     # Set the env_data to None in the case the user quits the application
     # without selecting an environment to use.
     app.set_return_value_on_exit((env_db, None))
     env_metadata = envs.get_env_metadata(env_type_db, env_data)
     index_view = functools.partial(
-        env_index, app, env_type_db, env_db, save_callable)
+        env_index, app, env_type_db, env_db, jenv_db, save_callable)
     detail_view = functools.partial(
-        env_detail, app, env_type_db, env_db, save_callable)
+        env_detail, app, env_type_db, env_db, jenv_db, save_callable)
     if 'name' in env_data:
         exists = True
         title = 'Edit the {} environment'
 
=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2014-12-16 14:12:44 +0000
+++ quickstart/manage.py	2014-12-17 12:34:18 +0000
@@ -203,7 +203,7 @@
     return save_callable
 
 
-def _start_interactive_session(parser, env_type_db, env_db, env_file):
+def _start_interactive_session(parser, env_type_db, env_db, jenv_db, env_file):
     """Start the Urwid interactive session.
 
     Return the env_data corresponding to the user selected environment.
@@ -212,7 +212,7 @@
     """
     save_callable = _create_save_callable(parser, env_file)
     new_env_db, env_data = views.show(
-        views.env_index, env_type_db, env_db, save_callable)
+        views.env_index, env_type_db, env_db, jenv_db, save_callable)
     if new_env_db != env_db:
         print('changes to the environments file have been saved')
     if env_data is None:
@@ -290,7 +290,7 @@
     if interactive:
         # Start the interactive session.
         env_data = _start_interactive_session(
-            parser, env_type_db, env_db, env_file)
+            parser, env_type_db, env_db, jenv_db, env_file)
     else:
         # This is a non-interactive session and we need to validate the
         # selected environment before proceeding.
 
=== modified file 'quickstart/models/jenv.py'
--- quickstart/models/jenv.py	2014-12-16 15:53:25 +0000
+++ quickstart/models/jenv.py	2014-12-17 12:34:18 +0000
@@ -130,9 +130,11 @@
     When a jenv file is created using "juju user add", the resulting YAML data
     is very concise, not even including the environment type.
     For this reason, the environment database returned by this function does
-    not contain the usual fields used as bootstrap options, but just the
-    environment name and the type. If the environment type is not included in
-    the jenv, UNKNOWN_ENV_TYPE is used.
+    not contain the usual fields used as bootstrap options.
+    The included fields are: "name", "type", "user" and "state-servers".
+
+    If the environment type is not included in the jenv, UNKNOWN_ENV_TYPE is
+    used.
     """
     db = {'environments': {}}
     path = os.path.expanduser(os.path.join(settings.JUJU_HOME, 'environments'))
@@ -153,7 +155,7 @@
         # Validate the jenv contents.
         try:
             data = serializers.yaml_load_from_path(fullpath)
-            validate(data)
+            credentials, servers = validate(data)
         except ValueError as err:
             logging.warn('ignoring invalid jenv file {}: {}'. format(
                 filename, bytes(err).decode('utf-8')))
@@ -164,7 +166,11 @@
         except ValueError:
             # This is expected when a jenv is generated with "juju user add".
             env_type = UNKNOWN_ENV_TYPE
-        environments[name] = {'type': env_type}
+        environments[name] = {
+            'type': env_type,
+            'user': credentials[0],
+            'state-servers': servers,
+        }
     return db
 
 
@@ -178,13 +184,59 @@
         - the environment file is not found;
         - the environment file contents are not parsable by YAML;
         - the environment data is not valid.
-    """
-    _get_credentials(data)
+
+    Return the environment credentials and state servers.
+    """
+    credentials = _get_credentials(data)
+    servers = _get_state_servers(data)
+    if not len(servers):
+        raise ValueError(b'no state-servers found')
+    return credentials, servers
+
+
+def get_env_short_description(env_data):
+    """Return a short description of the given env_data.
+
+    The given env_data must include at least the "name" and "type" keys.
+    """
+    parts = [env_data['name']]
+    env_type = env_data['type']
+    if env_type != UNKNOWN_ENV_TYPE:
+        parts.append('(type: {})'.format(env_type))
+    return ' '.join(parts)
+
+
+def get_env_details(env_data):
+    """Return the environment details as a sequence of tuples (label, value).
+
+    In each tuple, the label is the field name, and the value is the
+    corresponding value in the given env_data.
+    """
+    details = []
+    # Add the environment type.
+    env_type = env_data['type']
+    if env_type != UNKNOWN_ENV_TYPE:
+        details.append(('type', env_type))
+    # Add the environment name and user.
+    details.extend([
+        ('name', env_data['name']),
+        ('user', env_data['user']),
+    ])
+    # Add the state servers.
+    servers = ', '.join(env_data['state-servers'])
+    details.append(('state servers', servers))
+    return details
+
+
+def _get_state_servers(data):
+    """Return a tuple of Juju state servers for the given jenv data.
+
+    Raise a ValueError if the state servers cannot be retrieved.
+    """
     servers = data.get('state-servers')
     if not isinstance(servers, (list, tuple)):
         raise ValueError(b'invalid state-servers field')
-    if not len(servers):
-        raise ValueError(b'no state-servers found')
+    return tuple(servers)
 
 
 def _get_value_from_yaml(data, *args):
 
=== modified file 'quickstart/tests/cli/test_views.py'
--- quickstart/tests/cli/test_views.py	2014-11-12 15:41:40 +0000
+++ quickstart/tests/cli/test_views.py	2014-12-17 12:34:18 +0000
@@ -34,7 +34,10 @@
     ui,
     views,
 )
-from quickstart.models import envs
+from quickstart.models import (
+    envs,
+    jenv,
+)
 from quickstart.tests import helpers
 from quickstart.tests.cli import helpers as cli_helpers
 
@@ -178,7 +181,9 @@
         # a tuple including a copy of the given env_db and None, the latter
         # meaning no environment has been selected.
         env_db = helpers.make_env_db()
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         new_env_db, env_data = self.get_on_exit_return_value(self.loop)
         self.assertEqual(env_db, new_env_db)
         self.assertIsNot(env_db, new_env_db)
@@ -187,7 +192,9 @@
     def test_view_title(self):
         # The application title is correctly set up.
         env_db = helpers.make_env_db()
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         self.assertEqual(
             'Select an existing Juju environment or create a new one',
             self.app.get_title())
@@ -195,7 +202,9 @@
     def test_view_title_no_environments(self):
         # The application title changes if the env_db has no environments.
         env_db = {'environments': {}}
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         self.assertEqual(
             'No Juju environments already set up: please create one',
             self.app.get_title())
@@ -204,9 +213,11 @@
         # The view displays a list of the environments in env_db, and buttons
         # to create new environments.
         env_db = helpers.make_env_db()
+        jenv_db = {'environments': {}}
         with local_envs_supported(True):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # A button is created for each existing environment (see details) and
@@ -215,13 +226,39 @@
         expected_buttons_number = len(env_db['environments']) + len(env_types)
         self.assertEqual(expected_buttons_number, len(buttons))
 
+    def test_view_contents_with_imported_envs(self):
+        # The view displays a list of active imported environments, and buttons
+        # to create new environments.
+        env_db = {'environments': {}}
+        jenv_db = helpers.make_jenv_db()
+        with local_envs_supported(True):
+            views.env_index(
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
+        buttons = self.get_widgets_in_contents(
+            filter_function=self.is_a(ui.MenuButton))
+        # A button is created for each existing environment (see details) and
+        # for each environment type supported by quickstart (create).
+        env_types = envs.get_supported_env_types(self.env_type_db)
+        expected_buttons_number = (
+            # The number of active environments.
+            len(jenv_db['environments']) +
+            # The buttons to create new environments.
+            len(env_types) +
+            # The button to automatically create a new local environment.
+            1
+        )
+        self.assertEqual(expected_buttons_number, len(buttons))
+
     def test_new_local_environment_disabled(self):
         # The option to create a new local environment is not present if they
         # are not supported in the current platform.
         env_db = helpers.make_env_db()
+        jenv_db = helpers.make_jenv_db()
         with local_envs_supported(False):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         captions = map(cli_helpers.get_button_caption, buttons)
@@ -235,7 +272,9 @@
     def test_environment_clicked(self, mock_env_detail):
         # The environment detail view is called when clicking an environment.
         env_db = helpers.make_env_db()
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = {'environments': {}}
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # The environments are listed in alphabetical order.
@@ -250,20 +289,51 @@
             # corresponding environment data.
             cli_helpers.emit(button)
             mock_env_detail.assert_called_once_with(
-                self.app, self.env_type_db, env_db, self.save_callable,
-                env_data)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable, env_data)
             # Reset the mock so that it does not include any calls on the next
             # loop cycle.
             mock_env_detail.reset_mock()
 
+    @mock.patch('quickstart.cli.views.jenv_detail')
+    def test_imported_environment_clicked(self, mock_jenv_detail):
+        # The jenv detail view is called when clicking an imported environment.
+        env_db = {'environments': {}}
+        jenv_db = helpers.make_jenv_db()
+        with local_envs_supported(False):
+            views.env_index(
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
+        buttons = self.get_widgets_in_contents(
+            filter_function=self.is_a(ui.MenuButton))
+        # The environments are listed in alphabetical order.
+        environments = sorted(jenv_db['environments'])
+        for env_name, button in zip(environments, buttons):
+            env_data = envs.get_env_data(jenv_db, env_name)
+            # The caption includes the environment description.
+            env_description = jenv.get_env_short_description(env_data)
+            self.assertIn(
+                env_description, cli_helpers.get_button_caption(button))
+            # When the button is clicked, the jenv detail view is called
+            # passing the corresponding environment data.
+            cli_helpers.emit(button)
+            mock_jenv_detail.assert_called_once_with(
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable, env_data)
+            # Reset the mock so that it does not include any calls on the next
+            # loop cycle.
+            mock_jenv_detail.reset_mock()
+
     @mock.patch('quickstart.cli.views.env_edit')
     def test_create_new_environment_clicked(self, mock_env_edit):
         # The environment edit view is called when clicking to create a new
         # environment.
         env_db = helpers.make_env_db()
+        jenv_db = {'environments': {}}
         with local_envs_supported(True):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         env_types = envs.get_supported_env_types(self.env_type_db)
@@ -277,9 +347,11 @@
             # corresponding environment data.
             cli_helpers.emit(button)
             mock_env_edit.assert_called_once_with(
-                self.app, self.env_type_db, env_db, self.save_callable,
-                {'type': env_type,
-                 'default-series': settings.JUJU_GUI_SUPPORTED_SERIES[-1]})
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable, {
+                    'type': env_type,
+                    'default-series': settings.JUJU_GUI_SUPPORTED_SERIES[-1],
+                })
             # Reset the mock so that it does not include any calls on the next
             # loop cycle.
             mock_env_edit.reset_mock()
@@ -290,10 +362,12 @@
         # If that option is clicked, the view quits the application returning
         # the newly created env_data.
         env_db = envs.create_empty_env_db()
+        jenv_db = helpers.make_jenv_db()
         with maas_env_detected(False):
             with local_envs_supported(True):
                 views.env_index(
-                    self.app, self.env_type_db, env_db, self.save_callable)
+                    self.app, self.env_type_db, env_db, jenv_db,
+                    self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # The "create and bootstrap" button is the first one in the contents.
@@ -314,9 +388,11 @@
         # environment is not displayed if the current platform does not support
         # local environments.
         env_db = envs.create_empty_env_db()
+        jenv_db = helpers.make_jenv_db()
         with local_envs_supported(False):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # No "create and bootstrap local" buttons are present.
@@ -330,9 +406,11 @@
         # If that option is clicked, the view quits the application returning
         # the newly created env_data.
         env_db = envs.create_empty_env_db()
+        jenv_db = helpers.make_jenv_db()
         with maas_env_detected(True):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # The "create and bootstrap" button is the first one in the contents.
@@ -353,9 +431,11 @@
         # environment is not displayed if no MAAS API endpoints are
         # available on the system
         env_db = envs.create_empty_env_db()
+        jenv_db = helpers.make_jenv_db()
         with maas_env_detected(False):
             views.env_index(
-                self.app, self.env_type_db, env_db, self.save_callable)
+                self.app, self.env_type_db, env_db, jenv_db,
+                self.save_callable)
         buttons = self.get_widgets_in_contents(
             filter_function=self.is_a(ui.MenuButton))
         # No "create and bootstrap MAAS" buttons are present.
@@ -365,7 +445,9 @@
     def test_selected_environment(self):
         # The default environment is already selected in the list.
         env_db = helpers.make_env_db(default='lxc')
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         env_data = envs.get_env_data(env_db, 'lxc')
         env_description = envs.get_env_short_description(env_data)
         contents = self.app.get_contents()
@@ -377,31 +459,50 @@
     def test_status_with_errors(self):
         # The status message explains how errors are displayed.
         env_db = helpers.make_env_db()
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = {'environments': {}}
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         status = self.app.get_status()
         self.assertEqual(self.base_status + ' \N{BULLET} has errors ', status)
 
     def test_status_with_default(self):
         # The status message explains how default environment is represented.
         env_db = helpers.make_env_db(default='lxc', exclude_invalid=True)
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = {'environments': {}}
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         status = self.app.get_status()
         self.assertEqual(self.base_status + ' \N{CHECK MARK} default ', status)
 
-    def test_status_with_default_and_errors(self):
-        # The status message includes both default and errors explanations.
+    def test_status_with_active(self):
+        # The status message explains how active environments are displayed.
+        env_db = helpers.make_env_db(exclude_invalid=True)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
+        status = self.app.get_status()
+        self.assertEqual(self.base_status + ' \N{BULLET} active ', status)
+
+    def test_complete_status(self):
+        # The status message includes default, active and errors explanations.
         env_db = helpers.make_env_db(default='lxc')
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = helpers.make_jenv_db()
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         status = self.app.get_status()
         self.assertEqual(
             self.base_status +
-            ' \N{CHECK MARK} default  \N{BULLET} has errors ',
+            ' \N{CHECK MARK} default ' +
+            ' \N{BULLET} active ' +
+            ' \N{BULLET} has errors ',
             status)
 
-    def test_status(self):
+    def test_base_status(self):
         # The status only includes navigation info if there are no errors.
         env_db = helpers.make_env_db(exclude_invalid=True)
-        views.env_index(self.app, self.env_type_db, env_db, self.save_callable)
+        jenv_db = {'environments': {}}
+        views.env_index(
+            self.app, self.env_type_db, env_db, jenv_db, self.save_callable)
         status = self.app.get_status()
         self.assertEqual(self.base_status, status)
 
@@ -410,13 +511,14 @@
 
     base_status = ' \N{RIGHTWARDS ARROW OVER LEFTWARDS ARROW} navigate '
     env_db = helpers.make_env_db(default='lxc')
+    jenv_db = helpers.make_jenv_db()
 
     def call_view(self, env_name='lxc'):
         """Call the view passing the env_data corresponding to env_name."""
         self.env_data = envs.get_env_data(self.env_db, env_name)
         return views.env_detail(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            self.env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, self.env_data)
 
     def test_view_default_return_value_on_exit(self):
         # The view configures the app so that the return value on user exit is
@@ -483,7 +585,8 @@
         back_button = self.get_control_buttons()[0]
         cli_helpers.emit(back_button)
         mock_env_index.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable)
 
     def test_use_button(self):
         # The application exits if the "use" button is clicked.
@@ -522,8 +625,8 @@
         edit_button = self.get_control_buttons()[3]
         cli_helpers.emit(edit_button)
         mock_env_edit.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            self.env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, self.env_data)
 
     def test_remove_button(self):
         # A confirmation dialog is displayed if the "remove" button is clicked.
@@ -598,9 +701,82 @@
         self.assertEqual(self.base_status, status)
 
 
+class TestJenvDetail(EnvViewTestsMixin, unittest.TestCase):
+
+    env_db = helpers.make_env_db(default='lxc')
+    jenv_db = helpers.make_jenv_db()
+
+    def call_view(self, env_name='lxc'):
+        """Call the view passing the env_data corresponding to env_name."""
+        self.env_data = envs.get_env_data(self.jenv_db, env_name)
+        return views.jenv_detail(
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, self.env_data)
+
+    def test_view_default_return_value_on_exit(self):
+        # The view configures the app so that the return value on user exit is
+        # a tuple including a copy of the given env_db and None, the latter
+        # meaning no environment has been selected (for now).
+        self.call_view()
+        new_env_db, env_data = self.get_on_exit_return_value(self.loop)
+        self.assertEqual(self.env_db, new_env_db)
+        self.assertIsNot(self.env_db, new_env_db)
+        self.assertIsNone(env_data)
+
+    def test_view_title(self):
+        # The application title is correctly set up: it shows the description
+        # of the current jenv environment.
+        self.call_view()
+        env_description = jenv.get_env_short_description(self.env_data)
+        self.assertEqual(env_description, self.app.get_title())
+
+    def test_view_contents(self):
+        # The view displays the jenv details.
+        self.call_view()
+        widgets = self.get_widgets_in_contents(
+            filter_function=self.is_a(urwid.Text))
+        expected_texts = [
+            '{}: {}'.format(label, value) for label, value
+            in jenv.get_env_details(self.env_data)
+        ]
+        for expected_text, widget in zip(expected_texts, widgets):
+            self.assertEqual(expected_text, widget.text)
+
+    def test_view_buttons(self):
+        # The "back" and "use" buttons are displayed.
+        self.call_view(env_name='ec2-west')
+        buttons = self.get_control_buttons()
+        captions = map(cli_helpers.get_button_caption, buttons)
+        self.assertEqual(['back', 'use'], captions)
+
+    @mock.patch('quickstart.cli.views.env_index')
+    def test_back_button(self, mock_env_index):
+        # The index view is called if the "back" button is clicked.
+        self.call_view(env_name='ec2-west')
+        # The "back" button is the first one.
+        back_button = self.get_control_buttons()[0]
+        cli_helpers.emit(back_button)
+        mock_env_index.assert_called_once_with(
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable)
+
+    def test_use_button(self):
+        # The application exits if the "use" button is clicked.
+        # The env_db and the current environment data are returned.
+        self.call_view(env_name='ec2-west')
+        # The "use" button is the second one.
+        use_button = self.get_control_buttons()[1]
+        with self.assertRaises(ui.AppExit) as context_manager:
+            cli_helpers.emit(use_button)
+        expected_return_value = (self.env_db, self.env_data)
+        self.assertEqual(
+            expected_return_value, context_manager.exception.return_value)
+
+
 class TestEnvEdit(EnvViewTestsMixin, unittest.TestCase):
 
     env_db = helpers.make_env_db(default='lxc')
+    jenv_db = helpers.make_jenv_db()
 
     def call_view(self, env_name='lxc', env_type=None):
         """Call the view passing the env_data corresponding to env_name.
@@ -613,8 +789,8 @@
         else:
             self.env_data = {'type': env_type}
         return views.env_edit(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            self.env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, self.env_data)
 
     def get_form_contents(self):
         """Return the form contents included in the app page.
@@ -749,8 +925,8 @@
             'ec2-west successfully modified', self.app.get_message())
         # The application displays the environment detail view.
         mock_env_detail.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            new_env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, new_env_data)
 
     @mock.patch('quickstart.cli.views.env_detail')
     def test_save_empty_db(self, mock_env_detail):
@@ -769,8 +945,8 @@
         expected_new_env_data.update({'type': 'local', 'is-default': True})
         envs.set_env_data(self.env_db, None, expected_new_env_data)
         mock_env_detail.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            expected_new_env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, expected_new_env_data)
 
     def test_save_invalid_form_data(self):
         # Errors are displayed if the user tries to save invalid data.
@@ -815,7 +991,8 @@
         cancel_button = self.get_control_buttons()[1]
         cli_helpers.emit(cancel_button)
         mock_env_index.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable)
 
     @mock.patch('quickstart.cli.views.env_detail')
     def test_modification_view_cancel_button(self, mock_env_detail):
@@ -826,5 +1003,5 @@
         cancel_button = self.get_control_buttons()[1]
         cli_helpers.emit(cancel_button)
         mock_env_detail.assert_called_once_with(
-            self.app, self.env_type_db, self.env_db, self.save_callable,
-            self.env_data)
+            self.app, self.env_type_db, self.env_db, self.jenv_db,
+            self.save_callable, self.env_data)
 
=== modified file 'quickstart/tests/helpers.py'
--- quickstart/tests/helpers.py	2014-12-16 16:16:04 +0000
+++ quickstart/tests/helpers.py	2014-12-17 12:34:18 +0000
@@ -262,9 +262,21 @@
 def make_jenv_db():
     """Create and return a jenv files database."""
     environments = {
-        'ec2-west': {'type': '__unknown__'},
-        'lxc': {'type': 'local'},
-        'test-jenv': {'type': '__unknown__'},
+        'ec2-west': {
+            'type': '__unknown__',
+            'user': 'who',
+            'state-servers': ('1.2.3.4:42', '1.2.3.4:47'),
+        },
+        'lxc': {
+            'type': 'local',
+            'user': 'dalek',
+            'state-servers': ('localhost:17070', '10.0.3.1:17070'),
+        },
+        'test-jenv': {
+            'type': '__unknown__',
+            'user': 'my-user',
+            'state-servers': ('10.0.3.1:17070',),
+        },
     }
     return {'environments': environments}
 
 
=== modified file 'quickstart/tests/models/test_jenv.py'
--- quickstart/tests/models/test_jenv.py	2014-12-16 16:04:16 +0000
+++ quickstart/tests/models/test_jenv.py	2014-12-17 12:34:18 +0000
@@ -200,9 +200,14 @@
             'ec2': yaml.safe_dump(self.jenv_data),
         }):
             jenv_db = jenv.get_env_db()
-        self.assertEqual({
-            'environments': {'ec2': {'type': 'ec2'}},
-        }, jenv_db)
+        expected_environments = {
+            'ec2': {
+                'type': 'ec2',
+                'user': 'admin',
+                'state-servers': ('localhost:17070', '10.0.3.1:17070'),
+            },
+        }
+        self.assertEqual({'environments': expected_environments}, jenv_db)
 
     def test_multiple_jenv_files(self):
         # Multiple environments are correctly returned.
@@ -213,22 +218,29 @@
             'bootstrap-config': {'type': 'hp'},
         }
         jenv_data2 = {
-            'user': 'admin',
+            'user': 'my-user',
             'password': 'Secret!',
-            'state-servers': ['localhost:17070'],
+            'state-servers': ['1.2.3.4:5', '1.2.3.4:42'],
             'bootstrap-config': {'type': 'maas'},
         }
         with self.make_multiple_jenvs({
-            'hp': yaml.safe_dump(jenv_data1),
+            'hp-cloud': yaml.safe_dump(jenv_data1),
             'maas': yaml.safe_dump(jenv_data2),
         }):
             jenv_db = jenv.get_env_db()
-        self.assertEqual({
-            'environments': {
-                'hp': {'type': 'hp'},
-                'maas': {'type': 'maas'},
-            },
-        }, jenv_db)
+        expected_environments = {
+            'hp-cloud': {
+                'type': 'hp',
+                'user': 'admin',
+                'state-servers': ('localhost:17070',),
+            },
+            'maas': {
+                'type': 'maas',
+                'user': 'my-user',
+                'state-servers': ('1.2.3.4:5', '1.2.3.4:42'),
+            },
+        }
+        self.assertEqual({'environments': expected_environments}, jenv_db)
 
     def test_unknown_env_type(self):
         # If the jenv file does not include the env type, jenv.UNKNOWN_ENV_TYPE
@@ -240,9 +252,14 @@
         }
         with self.make_jenv('local', yaml.safe_dump(jenv_data)):
             jenv_db = jenv.get_env_db()
-        self.assertEqual({
-            'environments': {'local': {'type': jenv.UNKNOWN_ENV_TYPE}},
-        }, jenv_db)
+        expected_environments = {
+            'local': {
+                'type': jenv.UNKNOWN_ENV_TYPE,
+                'user': 'admin',
+                'state-servers': ('localhost:17070',),
+            },
+        }
+        self.assertEqual({'environments': expected_environments}, jenv_db)
 
     def test_extraneous_files(self):
         # Extraneous files are ignored.
@@ -261,7 +278,9 @@
 
     def test_validation_success(self):
         # A valid jenv file is successfully validated.
-        jenv.validate(self.jenv_data)
+        credentials, servers = jenv.validate(self.jenv_data)
+        self.assertEqual(('admin', 'Secret!'), credentials)
+        self.assertEqual(('localhost:17070', '10.0.3.1:17070'), servers)
 
     def test_invalid_credentials(self):
         # A ValueError is raised if the credentials cannot be retrieved.
@@ -296,3 +315,54 @@
                 'password': 'Secret!',
                 'state-servers': [],
             })
+
+
+class TestGetEnvShortDescription(unittest.TestCase):
+
+    def test_env(self):
+        # The env description includes the environment name and type.
+        env_data = {'name': 'lxc', 'type': 'local'}
+        description = jenv.get_env_short_description(env_data)
+        self.assertEqual('lxc (type: local)', description)
+
+    def test_env_without_type(self):
+        # Without the type we can only show the environment name.
+        env_data = {'name': 'ec2', 'type': jenv.UNKNOWN_ENV_TYPE}
+        description = jenv.get_env_short_description(env_data)
+        self.assertEqual('ec2', description)
+
+
+class TestGetEnvDetails(unittest.TestCase):
+
+    def test_env(self):
+        # The environment details are properly returned.
+        env_data = {
+            'name': 'lxc',
+            'type': 'local',
+            'user': 'who',
+            'state-servers': ('1.2.3.4:17060', 'localhost:17070'),
+        }
+        expected_details = [
+            ('type', 'local'),
+            ('name', 'lxc'),
+            ('user', 'who'),
+            ('state servers', '1.2.3.4:17060, localhost:17070'),
+        ]
+        details = jenv.get_env_details(env_data)
+        self.assertEqual(expected_details, details)
+
+    def test_env_without_type(self):
+        # The environment type is not included if unknown.
+        env_data = {
+            'name': 'aws',
+            'type': jenv.UNKNOWN_ENV_TYPE,
+            'user': 'the-doctor',
+            'state-servers': ('1.2.3.4:17060',),
+        }
+        expected_details = [
+            ('name', 'aws'),
+            ('user', 'the-doctor'),
+            ('state servers', '1.2.3.4:17060'),
+        ]
+        details = jenv.get_env_details(env_data)
+        self.assertEqual(expected_details, details)
 
=== modified file 'quickstart/tests/test_manage.py'
--- quickstart/tests/test_manage.py	2014-12-16 16:04:16 +0000
+++ quickstart/tests/test_manage.py	2014-12-17 12:34:18 +0000
@@ -36,7 +36,10 @@
     settings,
 )
 from quickstart.cli import views
-from quickstart.models import envs
+from quickstart.models import (
+    envs,
+    jenv,
+)
 from quickstart.tests import helpers
 
 
@@ -372,13 +375,15 @@
         self.env_type_db = envs.get_env_type_db()
         self.env_file = self.make_env_file()
         self.env_db = envs.load(self.env_file)
+        self.jenv_db = helpers.make_jenv_db()
 
     @contextmanager
-    def patch_interactive_mode(self, env_db, return_value):
+    def patch_interactive_mode(self, env_db, jenv_db, return_value):
         """Patch the quickstart.cli.views.show function.
 
         Ensure the interactive mode is started by the code in the context block
-        passing the given env_db. Make the view return the given return_value.
+        passing the given env_db and jenv_db.
+        Make the view return the given return_value.
         """
         create_save_callable_path = 'quickstart.manage._create_save_callable'
         mock_show = mock.Mock(return_value=return_value)
@@ -387,16 +392,18 @@
                 yield
         mock_save_callable.assert_called_once_with(self.parser, self.env_file)
         mock_show.assert_called_once_with(
-            views.env_index, self.env_type_db, env_db,
+            views.env_index, self.env_type_db, env_db, jenv_db,
             mock_save_callable())
 
     def test_resulting_env_data(self):
         # The interactive session can be used to select an environment, in
         # which case the function returns the corresponding env_data.
         env_data = envs.get_env_data(self.env_db, 'aws')
-        with self.patch_interactive_mode(self.env_db, [self.env_db, env_data]):
+        with self.patch_interactive_mode(
+                self.env_db, self.jenv_db, [self.env_db, env_data]):
             obtained_env_data = manage._start_interactive_session(
-                self.parser, self.env_type_db, self.env_db, self.env_file)
+                self.parser, self.env_type_db, self.env_db, self.jenv_db,
+                self.env_file)
         self.assertEqual(env_data, obtained_env_data)
 
     @helpers.mock_print
@@ -405,9 +412,11 @@
         # during the interactive session.
         env_data = envs.get_env_data(self.env_db, 'aws')
         new_env_db = helpers.make_env_db()
-        with self.patch_interactive_mode(self.env_db, [new_env_db, env_data]):
+        with self.patch_interactive_mode(
+                self.env_db, self.jenv_db, [new_env_db, env_data]):
             manage._start_interactive_session(
-                self.parser, self.env_type_db, self.env_db, self.env_file)
+                self.parser, self.env_type_db, self.env_db, self.jenv_db,
+                self.env_file)
         mock_print.assert_called_once_with(
             'changes to the environments file have been saved')
 
@@ -415,9 +424,11 @@
     def test_interactive_mode_quit(self, mock_exit):
         # If the user explicitly quits the interactive mode, the program exits
         # without proceeding with the environment bootstrapping.
-        with self.patch_interactive_mode(self.env_db, [self.env_db, None]):
+        with self.patch_interactive_mode(
+                self.env_db, self.jenv_db, [self.env_db, None]):
             manage._start_interactive_session(
-                self.parser, self.env_type_db, self.env_db, self.env_file)
+                self.parser, self.env_type_db, self.env_db, self.jenv_db,
+                self.env_file)
         mock_exit.assert_called_once_with('quitting')
 
 
@@ -488,7 +499,9 @@
         self.assertIsNone(result)
 
 
-class TestSetupEnv(helpers.EnvFileTestsMixin, unittest.TestCase):
+class TestSetupEnv(
+        helpers.EnvFileTestsMixin, helpers.JenvFileTestsMixin,
+        unittest.TestCase):
 
     def setUp(self):
         self.parser = mock.Mock()
@@ -596,10 +609,12 @@
         env_data = envs.get_env_data(env_db, 'aws')
         get_env_type_db_path = 'quickstart.models.envs.get_env_type_db'
         with mock.patch(get_env_type_db_path) as mock_get_env_type_db:
-            with self.patch_interactive_mode(env_data) as mock_interactive:
-                manage._setup_env(options, self.parser)
+            with self.make_jenv('ec2', yaml.safe_dump(self.jenv_data)):
+                jenv_db = jenv.get_env_db()
+                with self.patch_interactive_mode(env_data) as mock_interactive:
+                    manage._setup_env(options, self.parser)
         mock_interactive.assert_called_once_with(
-            self.parser, mock_get_env_type_db(), env_db, env_file)
+            self.parser, mock_get_env_type_db(), env_db, jenv_db, env_file)
         # The options is updated with data from the selected environment.
         self.assertEqual(env_file, options.env_file)
         self.assertEqual('aws', options.env_name)