Merge lp://qastaging/~frankban/juju-quickstart/support-cache-yaml into lp://qastaging/juju-quickstart

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 142
Proposed branch: lp://qastaging/~frankban/juju-quickstart/support-cache-yaml
Merge into: lp://qastaging/juju-quickstart
Diff against target: 2301 lines (+663/-522)
19 files modified
quickstart/__init__.py (+1/-1)
quickstart/app.py (+8/-63)
quickstart/cli/params.py (+2/-4)
quickstart/cli/views.py (+19/-46)
quickstart/manage.py (+43/-39)
quickstart/models/apiinfo.py (+110/-0)
quickstart/models/jenv.py (+8/-0)
quickstart/platform_support.py (+5/-11)
quickstart/settings.py (+1/-1)
quickstart/tests/cli/test_params.py (+6/-13)
quickstart/tests/cli/test_views.py (+68/-122)
quickstart/tests/functional/test_functional.py (+1/-1)
quickstart/tests/helpers.py (+25/-6)
quickstart/tests/models/test_apiinfo.py (+242/-0)
quickstart/tests/models/test_bundles.py (+6/-6)
quickstart/tests/test_app.py (+22/-114)
quickstart/tests/test_manage.py (+86/-85)
quickstart/tests/test_platform_support.py (+5/-5)
tox.ini (+5/-5)
To merge this branch: bzr merge lp://qastaging/~frankban/juju-quickstart/support-cache-yaml
Reviewer Review Type Date Requested Status
Madison Scott-Clary (community) code+qa Approve
Martin Hilton (community) Approve
Review via email: mp+276540@code.qastaging.launchpad.net

Description of the change

Use API info to connect to existing environments.

Do not rely on jenv files for handling already bootstrapped
environments. Instead, use the `juju api-info` command in order
to retrieve the existing environment's credentials, API addresses
and UUID.

As a consequence, drop support to Juju 1.18: the minimum supported
version is now Juju 1.22.1 (present in trusty-updates).

Also update to test against jujubundlelib 0.2.0 and jujuclient 0.50.2.

Apologies for the long diff, but a lot of code has been removed and
simplified.

Tests: `make check`.

QA: run quickstart (`devenv/bin/juju-quickstart`) to set up envs and
deploy bundles both with jes enabled (`export JUJU_DEV_FEATURE_FLAGS=jes`)
and disabled. Check that everything works as usual.

To post a comment you must log in.
Revision history for this message
Martin Hilton (martin-hilton) wrote :

LGTM no QA

review: Approve
Revision history for this message
Francesco Banconi (frankban) wrote :

Thanks for the review Martin!

150. By Francesco Banconi

Fix typo.

151. By Francesco Banconi

Fix functional tests.

Revision history for this message
Madison Scott-Clary (makyo) wrote :

QA okay with one minor comment below, thanks!

review: Approve (code+qa)
152. By Francesco Banconi

Update jujuclient and jujubundlelib dependencies.

Revision history for this message
Francesco Banconi (frankban) wrote :

Thanks for the review Madison, I fixed the test.

153. By Francesco Banconi

Fix tests intermittently failing due to sorting issues.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches