Merge lp://qastaging/~frankban/juju-quickstart/handle-gui-ports into lp://qastaging/juju-quickstart

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 134
Proposed branch: lp://qastaging/~frankban/juju-quickstart/handle-gui-ports
Merge into: lp://qastaging/juju-quickstart
Diff against target: 1265 lines (+640/-133)
13 files modified
quickstart/__init__.py (+1/-1)
quickstart/app.py (+34/-3)
quickstart/jujugui.py (+84/-0)
quickstart/jujutools.py (+10/-42)
quickstart/manage.py (+75/-18)
quickstart/platform_support.py (+0/-1)
quickstart/tests/test_app.py (+93/-13)
quickstart/tests/test_juju.py (+11/-0)
quickstart/tests/test_jujugui.py (+123/-0)
quickstart/tests/test_jujutools.py (+47/-48)
quickstart/tests/test_manage.py (+125/-7)
quickstart/tests/test_utils.py (+23/-0)
quickstart/utils.py (+14/-0)
To merge this branch: bzr merge lp://qastaging/~frankban/juju-quickstart/handle-gui-ports
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+260032@code.qastaging.launchpad.net

Description of the change

Handle Juju GUI server port.

The Juju GUI charm can be configured to listen
to customized ports (juju set juju-gui port=n).
This branch adds to quickstart the ability to
detect the port used by the GUI server, and
therefore connect to the right WebSocket and
Web URLs. Additionally handle the cases in which
the GUI is run in non secure mode.

Also add an option to deploy the GUI on a
customized port directly using quickstart.

Also add an hidden options (--gui-source)
intended for development use only. This allows
for building a specific GUI github branch
(e.g. frankban/my-feature-branch or juju/develop)
when installing the Juju GUI, and can be useful
while coding/QAing GUI branches.

Tests: `make check`.

QA:
- use the GUI as usual, to check for regressions:
  `devenv/bin/juju-quickstart`;
- change the juju-gui port and secure mode:
  `juju set juju-gui port=4242 secure=false`
- wait for the changes to take effect;
- use quickstart again to check that insecure mode
  and customized ports are detected:
  `devenv/bin/juju-quickstart`;
- destroy the environment;
- use quickstart again to server the GUI develop
  branch on a customized port:
  `devenv/bin/juju-quickstart --gui-port 8000 --gui-source juju/develop`;
- check that everything works correctly;
- destroy the environment;
- done, thank you!

https://codereview.appspot.com/238540043/

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Reviewers: mp+260032_code.launchpad.net,

Message:
Please take a look.

Description:
Handle Juju GUI server port.

The Juju GUI charm can be configured to listen
to customized ports (juju set juju-gui port=n).
This branch adds to quickstart the ability to
detect the port used by the GUI server, and
therefore connect to the right WebSocket and
Web URLs. Additionally handle the cases in which
the GUI is run in non secure mode.

Also add an option to deploy the GUI on a
customized port directly using quickstart.

Also add an hidden options (--gui-source)
intended for development use only. This allows
for building a specific GUI github branch
(e.g. frankban/my-feature-branch or juju/develop)
when installing the Juju GUI, and can be useful
while coding/QAing GUI branches.

Tests: `make check`.

QA:
- use the GUI as usual, to check for regressions:
   `devenv/bin/juju-quickstart`;
- change the juju-gui port and secure mode:
   `juju set juju-gui port=4242 secure=false`
- wait for the changes to take effect;
- use quickstart again to check that insecure mode
   and customized ports are detected:
   `devenv/bin/juju-quickstart`;
- destroy the environment;
- use quickstart again to server the GUI develop
   branch on a customized port:
   `devenv/bin/juju-quickstart --gui-port 8000 --gui-source
juju/develop`;
- check that everything works correctly;
- destroy the environment;
- done, thank you!

https://code.launchpad.net/~frankban/juju-quickstart/handle-gui-ports/+merge/260032

(do not edit description out of merge proposal)

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

Affected files (+642, -133 lines):
   A [revision details]
   M quickstart/__init__.py
   M quickstart/app.py
   A quickstart/jujugui.py
   M quickstart/jujutools.py
   M quickstart/manage.py
   M quickstart/platform_support.py
   M quickstart/tests/test_app.py
   M quickstart/tests/test_juju.py
   A quickstart/tests/test_jujugui.py
   M quickstart/tests/test_jujutools.py
   M quickstart/tests/test_manage.py
   M quickstart/tests/test_utils.py
   M quickstart/utils.py

141. By Francesco Banconi

Fix typo.

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

Please take a look.

https://codereview.appspot.com/238540043/diff/1/quickstart/jujugui.py
File quickstart/jujugui.py (right):

https://codereview.appspot.com/238540043/diff/1/quickstart/jujugui.py#newcode59
quickstart/jujugui.py:59: def parse_charm_url(charm_url):
This function was just moved.

https://codereview.appspot.com/238540043/

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

LGTM QA okay! Thanks for the work on this

https://codereview.appspot.com/238540043/

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

*** Submitted:

Handle Juju GUI server port.

The Juju GUI charm can be configured to listen
to customized ports (juju set juju-gui port=n).
This branch adds to quickstart the ability to
detect the port used by the GUI server, and
therefore connect to the right WebSocket and
Web URLs. Additionally handle the cases in which
the GUI is run in non secure mode.

Also add an option to deploy the GUI on a
customized port directly using quickstart.

Also add an hidden options (--gui-source)
intended for development use only. This allows
for building a specific GUI github branch
(e.g. frankban/my-feature-branch or juju/develop)
when installing the Juju GUI, and can be useful
while coding/QAing GUI branches.

Tests: `make check`.

QA:
- use the GUI as usual, to check for regressions:
   `devenv/bin/juju-quickstart`;
- change the juju-gui port and secure mode:
   `juju set juju-gui port=4242 secure=false`
- wait for the changes to take effect;
- use quickstart again to check that insecure mode
   and customized ports are detected:
   `devenv/bin/juju-quickstart`;
- destroy the environment;
- use quickstart again to server the GUI develop
   branch on a customized port:
   `devenv/bin/juju-quickstart --gui-port 8000 --gui-source
juju/develop`;
- check that everything works correctly;
- destroy the environment;
- done, thank you!

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

https://codereview.appspot.com/238540043/

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