lp:~frankban/juju-quickstart/old-style-bundles-regression

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:juju-quickstart at revision 123

Juju GUI Hackers: Pending requested 2015-03-09

Diff: 1630 lines (+868/-269)

15 files modified

quickstart/__init__.py (+1/-1)
quickstart/app.py (+4/-2)
quickstart/charmstore.py (+161/-0)
quickstart/manage.py (+5/-5)
quickstart/models/bundles.py (+136/-59)
quickstart/models/references.py (+9/-48)
quickstart/netutils.py (+9/-18)
quickstart/settings.py (+2/-2)
quickstart/tests/helpers.py (+5/-4)
quickstart/tests/models/test_bundles.py (+166/-25)
quickstart/tests/models/test_references.py (+0/-37)
quickstart/tests/test_app.py (+31/-27)
quickstart/tests/test_charmstore.py (+313/-0)
quickstart/tests/test_netutils.py (+25/-40)
quickstart/utils.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

130. By Francesco Banconi on 2015-03-10

Changes as per review.

129. By Francesco Banconi on 2015-03-09

simplify logging

128. By Francesco Banconi on 2015-03-09

done

127. By Francesco Banconi on 2015-03-09

done

126. By Francesco Banconi on 2015-03-09

add the charmstore module.

125. By Francesco Banconi on 2015-03-09

done

124. By Francesco Banconi on 2015-03-06

wip

123. By Francesco Banconi on 2015-03-06

proto

122. By Francesco Banconi on 2015-03-02

Support retrieving bundles from charm store v4.

This branch implements the ability to deploy
bundles from the new charm store, retrieving
them with the v4 API.

Also introduce the new preferred bundle id
spelling, i.e. reflecting jujucharms.com paths,
like "mediawiki-single" or "u/who/bundle-name".

The old "bundle:basket/name" identifiers are
still supported but deprecated.
Deploying a bundle by specifying a directory
containing the YAML file is instead not
supported anymore.

Ok, after this brief summary let me take two
lines to really apologize for the huge diff.
While I was there, I refactored some historical
inconsistencies (e.g. models.Charm really being
just a charm or bundle reference), and I also
improved the bundle model API so that the work
is done in the model and not in manage as before.
There are a lot of tests too, and some documentation.
Nonetheless, let me say sorry again, this is
really too much stuff.

With this branch Juju Quickstart is quite ready for
the v4 world. The "deploy bundle" API call to the GUI
server still uses the legacy format, but the ugliness
of being backward compatible with namespaced bundles
is very restrained and implemented in private logic
in the bundles model module.

Tests: `make check`.

QA: run `devenv/bin/juju-quickstart` to deploy
new style and old style bundles, with both version
3 and 4 formats. Note that version 3 can only be
provided with arbitrary URLs or local files.

Thanks a lot!

R=rharding, matthew.scott
CC=
https://codereview.appspot.com/207040043

121. By Francesco Banconi on 2015-02-10

Add support for new Juju WebSocket API endpoints.

Recent Juju versions introduced a new API endpoint
path. In essence, instead of the usual
"wss://<address>:17070", the new
"wss://<address>:17070/environment/<env-uuid>/api"
is used to connect to the API.
This allows for connecting to a specific environment
in a multi-environment state server scenario.

In this branch the new API endpoint is used if a recent
Juju version is in use, and if it is possible to retrieve
the environment UUID from the jenv file.

Also, when connecting to the GUI server (for creating
the auth token or for deploying bundles), use the new
GUI server API endpoints when possible, i.e. when the
charm is recent enough to support redirecting requests
to the new Juju endpoints.
Note that this feature is assumed to land in the next
juju-gui charm release (see settings.py). If that's
not the case, we'll need to increase the charm revisions
in settings.MINIMUM_REVISIONS_FOR_NEW_API_ENDPOINT
before releasing the new Quickstart.

Tests: `make check`

QA:
- bootstrap quickstart as usual: `devenv/bin/juju-quickstart`;
- check that, if you are using juju devel (1.22beta), quickstart
  properly connect to the new API endpoint;
- run quickstart again to deploy a bundle, e.g.:
  `devenv/bin/juju-quickstart bundle:mediawiki/single`;
- ensure that the deployment request succeeds;
- if possible, do the above with and older version of Juju,
  to ensure backward compatibility.

Done, thank you!

R=martin.hilton, jeff.pihach
CC=
https://codereview.appspot.com/199490043