Merge lp://staging/~frankban/charms/precise/juju-gui/support-default-charm-icon into lp://staging/~juju-gui/charms/precise/juju-gui/trunk

Reviewers: mp+214985_code.launchpad.net,

Message:
Please take a look.

Description:
Make the GUI server redirect to the default icon.

Create a specialized proxy handler for handling
Juju HTTP API requests. In this subclass, handle
the case a request is for a local charm icon
that cannot be found on the Juju server.

Tests: `make unittest`.

QA:
- `juju bootstrap`;
- from the branch root, run `make deploy`;
- wait for the GUI service to be ready;
- switch to the trunk branch:
   `juju set juju-gui juju-gui-source=develop`
- wait for the GUI to be ready;
- deploy local charms including an icon:
   you should see the icons are correctly displayed in the
   service blocks and inspector header;
- deploy a local charm not including an icon:
   you should see the fallback icon displayed both in
   the service block and the inspector;
- destroy the environment, done.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/support-default-charm-icon/+merge/214985

(do not edit description out of merge proposal)

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

Affected files (+148, -21 lines):
   A [revision details]
   M revision
   M server/guiserver/__init__.py
   M server/guiserver/apps.py
   M server/guiserver/handlers.py
   M server/guiserver/tests/test_handlers.py

Code LGTM

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py
File server/guiserver/handlers.py (right):

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py#newcode255
server/guiserver/handlers.py:255: # Handle POST requests the same way
GET ones are handled.
s/ones/requests/ -- just reads better.

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py#newcode320
server/guiserver/handlers.py:320: Override to handle the case a when a
charm icon is not found.
s/a when/when/ or /for when/?

https://codereview.appspot.com/86100043/

Please take a look.

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py
File server/guiserver/handlers.py (right):

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py#newcode255
server/guiserver/handlers.py:255: # Handle POST requests the same way
GET ones are handled.
On 2014/04/09 16:32:42, bac wrote:
> s/ones/requests/ -- just reads better.

Done.

https://codereview.appspot.com/86100043/diff/1/server/guiserver/handlers.py#newcode320
server/guiserver/handlers.py:320: Override to handle the case a when a
charm icon is not found.
On 2014/04/09 16:32:42, bac wrote:
> s/a when/when/ or /for when/?

Done.

https://codereview.appspot.com/86100043/

QA OK too

https://codereview.appspot.com/86100043/

*** Submitted:

Make the GUI server redirect to the default icon.

Create a specialized proxy handler for handling
Juju HTTP API requests. In this subclass, handle
the case a request is for a local charm icon
that cannot be found on the Juju server.

Tests: `make unittest`.

QA:
- `juju bootstrap`;
- from the branch root, run `make deploy`;
- wait for the GUI service to be ready;
- switch to the trunk branch:
   `juju set juju-gui juju-gui-source=develop`
- wait for the GUI to be ready;
- deploy local charms including an icon:
   you should see the icons are correctly displayed in the
   service blocks and inspector header;
- deploy a local charm not including an icon:
   you should see the fallback icon displayed both in
   the service block and the inspector;
- destroy the environment, done.

R=bac
CC=
https://codereview.appspot.com/86100043

https://codereview.appspot.com/86100043/

Thank you Brad.

https://codereview.appspot.com/86100043/