lp:~hatch/charms/trusty/juju-gui/add-uuid-configjs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~juju-gui/charms/trusty/juju-gui/trunk at revision 231

Madison Scott-Clary (community): Approve on 2015-02-09

Francesco Banconi: Approve on 2015-02-06

Diff: 94 lines (+19/-5)

6 files modified

Makefile (+1/-1)
config/config.js.template (+2/-1)
hooks/backend.py (+2/-1)
hooks/utils.py (+2/-1)
tests/test_backends.py (+2/-1)
tests/test_utils.py (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

233. By Jeff Pihach on 2015-02-09

Added additional test for the write_gui_config method around the uuid support

232. By Jeff Pihach on 2015-02-05

Fixed failing test from adding juju_env_uuid support

231. By Jeff Pihach on 2015-02-05

Update the makefile to support pip 6+

230. By Jeff Pihach on 2015-02-04

Add the Juju environments UUID to the config.js for the GUI

229. By Madison Scott-Clary on 2015-01-13

Merged back the new charm release.

228. By Madison Scott-Clary on 2015-01-13

Updated to the newest juju-gui release.

227. By Madison Scott-Clary on 2015-01-13

Merged changes from the released charm

226. By Francesco Banconi on 2015-01-05

Update to Tornado 3.2.2.

This is done as an attempt to fix the
Tornado race condition described in [1]

Also use the newest version of the
futures package.

Add the missing firefox dependency to the
sysdeps make target.

Simplify the GUI server WebSocket client now that
Tornado supports close() out of the box.

Update the utils.clone_request function so that
the ProxyHandler does not fail if a GET request
is performed with an empty string body.

Other tests fixes.

Tests: `make lint unittest`

QA:
- bootstrap an environment;
- run `make deploy` and wait for the GUI to be ready;
- use the GUI as usual to deploy charms and bundles:
  ensure everything works as usual, with events correctly
  reported by the GUI and no disconnections from core
  happen;
- use `juju ssh juju-gui/0 sudo tailf /var/log/upstart/guiserver.log`
  to check no errors are reported by the GUI server while
  working with the GUI;
- ensure the juju-gui icon is correctly displayed in the service view
  (meaning local charm icons are still properly retrieved from core);
- destroy the environment.

[1] https://bugs.launchpad.net/juju-gui/+bug/1402061

R=rharding, martin.hilton
CC=
https://codereview.appspot.com/195720043

225. By Jeff Pihach on 2014-12-18

Converted showGetJujuButton to hideLoginButton to match UI changes in the GUI

224. By Francesco Banconi on 2014-12-17

Support deploying bundles from custom users.

Also add the charmstore-url charm option so
that the new GUI can properly connect to the
charm store.

Update the deployer version (we use a fork for now)
and the GUI server so that both the user and the
password are provided when calling the deployer
blocking functions.

If you are curious, the deployer merge proposal is here:
https://code.launchpad.net/~frankban/juju-deployer/guiserver-auth/+merge/244984

Tests: `make unittest`.

QA:
- bootstrap an environment with juju 1.21;
- deploy this charm by using `make deploy`;
- wait for the charm to be ready;
- switch to the most recent GUI:
  `juju set juju-gui juju-gui-source=develop`;
- while waiting, create a new juju user:
  `juju user add new-user --generate`;
- copy to clipboard the password included in the
  resulting new-user.jenv file;
- wait for the trunk release to be ready;
- visit the GUI and log in using "new-user" and
  the copied password;
- ensure the charm browser is correctly displayed, meaning
  the charm properly connects to the charm store;
- search for a bundle in the browser and deploy it: you should
  get this error: "An error occurred while deploying the bundle:
  Invalid relation in config, service 1 not found, rel 1 <-> 0
  Invalid relation in config, service 0 not found, rel 1 <-> 0"
  or similar... This is another issue. Dragging and dropping an old
  bundle from your desktop should instead work;
- destroy the environment.

Done, thank you!

R=
CC=
https://codereview.appspot.com/191940043