~frankban/charms/precise/juju-gui/guiserver-async-watcher : changes

~frankban/charms/precise/juju-gui/guiserver-async-watcher » Changes from revision 89.2.1

From Revision 89.2.1 to 71

Rev	Summary	Authors	Date
89.2.1	Add support for nagios-external-master subordinate charm. Add support for nagios-external-master subordinate charm.	Curtis Hovey	11 years ago
89	Integrate the built-in server into the charm. Integrate the built-in server into the charm. Add a "builtin-server" option to config.yaml, defaulting to false, to enable a new Tornado-based built-in web server, in place of haproxy and Apache (still the default). Add a "guiserver.conf" Upstart config file, generated via a template. Add a BuiltinServerMixin to hooks/backend.py . Add tests for the new functions in hooks/utils.py . Clean up all paths and constants in hooks/utils.py . Miscellaneuos cleanup. QA1 (quick): $ make unittest QA2 (long, 40 minutes): $ make ftest QA3 (long but shorter than the former): $ juju bootstrap $ make deploy (check web access) $ juju set juju-gui builtin-server=true (check web access) $ juju set juju-gui builtin-server=false (check web access) $ juju destroy-environment R=frankban, matthew.scott CC= https://codereview.appspot.com/12650044	Nicola Larosa	11 years ago
88	Fix charm functional tests. Fix charm functional tests. Updated Selenium to the last version: it includes a fix for Firefox 23. Also updated the force-machine test: use the new --to juju-core option. R= CC= https://codereview.appspot.com/12665043	Francesco Banconi	11 years ago
87	Refactor the config generation logic. Refactor the config generation logic. As requested by reviews, change the server configuration generation logic so that the various server configuration files are present on the filesystem only for the actually deployed and started servers. This is implemented by creating additional start_* and stop_* functions in hooks/utils.py, called by the mixins in hooks/backend.py, and moving there/creating the logic that generates, writes and remove the various configuration files. In addition: - factor out common SSL code between HaproxyApacheMixin and BuiltinServerMixin; - rename options.http to options.insecure in server/guiserver/manage.py - remove unused code and backend properties; - miscellaneous cleanup. The diff is still a bit big, even after moving the builtin server integration changes to another branch. Sorry about that. R=frankban, bac CC= https://codereview.appspot.com/12467044	Nicola Larosa	11 years ago
86	Authentication fixes. Authentication fixes. Fixed an error in the guiserver authentication when the request id is set to 0. Moved the auth_backend from the app to the handler: it is only relevant in the WebSocketHandler context. Some clean up in the tests. R=benjamin.saller, matthew.scott CC= https://codereview.appspot.com/12612043	Francesco Banconi	11 years ago
85	Merged charmers trunk. Merged charmers trunk.	Francesco Banconi	11 years ago
84	Merged charmers trunk. Merged charmers trunk.	Francesco Banconi	11 years ago
83	Merge readme. Merge readme.	Matthew Scott	11 years ago
82	Support serving the GUI over a non secure conn. Support serving the GUI over a non secure conn. The GUI server can be configured to run the GUI static files server and the WebSocket server over an HTTP connection. This way we support the secure=false charm option. Tests: Run `make unittest` from the branch root. R=gary.poster, teknico CC= https://codereview.appspot.com/12088046	Francesco Banconi	11 years ago
81	Refactor for easier builtin server integration. Refactor for easier builtin server integration. Refactor the charm code to ease integration of the builtin server. Detail of the changes, per file: hooks/backend.py: - order the mixins code as they are called, to ease readability; - merge InstallMixin into GuiMixin; - rename UpstartMixin to HaproxyApacheMixin; - reimplement GuiMixin.install using the new functions from the split of hooks/utils.py#fetch_gui (see below); - reimplement GuiMixin.start using the new functions from the split of hooks/utils.py#start_gui (see below); - move here the chain and merge functions from hooks/utils.py, renaming them to be less generic; - further simplify the backend constructor code. hooks/utils.py: - rename JUJU_GUI_SITE and JUJU_GUI_PORTS to APACHE_SITE and APACHE_PORTS respectively; - split the start_gui function into compute_build_dir, write_gui_config and write_haproxy_config; - split the fetch_gui function into fetch_gui_from_branch and fetch_gui_release; - move the chain and merge functions to hooks/backend.py. tests/test_backends.py: - rename, add mocks and reorder to make tests pass again. tests/test_utils.py: - rename TestStartStop to TestStartImprovAgentGui; - split the start_gui function tests in TestStartImprovAgentGui into tests for compute_build_dir, write_gui_config, write_haproxy_config and write_apache_config; Sorry for the big diff. It was even bigger, but I moved some of the changes to a future branch. R=bac, gary.poster CC= https://codereview.appspot.com/12022044	Nicola Larosa	11 years ago
80	GUI server supports serving GUI tests. GUI server supports serving GUI tests. Added support for serving GUI unit tests from the Tornado server if the --servetest parameter is passed. Also added support for the "ssl-cert-path" option: the path where the SSL key and cert files are stored. Tests: Run `make unittest` from the branch root. R=teknico, gary.poster CC= https://codereview.appspot.com/11841043	Francesco Banconi	11 years ago
79	GUI server authentication. GUI server authentication. Added authentication management to the Tornado server. The WebSocket handler includes a way to know if the connected client is logged in to the API server. Both Go and Python API implementations are supported. Also implemented WebSocket messages validation. I am sorry: this diff is quite long. In my defence, the code is full of tests and documentation... Well, sorry again. Tests: `make unittest` R=benjamin.saller, benji, teknico CC= https://codereview.appspot.com/11725044	Francesco Banconi	11 years ago
78	New WebSocket connection implementation. New WebSocket connection implementation. This branch includes a new WebSocket client implementation purely based on Tornado. Dropped the ws4py dependency, previously introduced as a consequence of the built-in client not being able to connect to juju-core. Investigation: I investigated this problem and found that the WebSocket server implementation in the standard go.net library (used by juju-core) requires the "Origin" header to be sent by the client when the WebSocket handshake is initiated. See https://code.google.com/p/go/source/browse/websocket/hybi.go?repo=net#514 lines 514-517. However, if I read the RFC correctly, this is not entirely the right behavior: see http://tools.ietf.org/html/rfc6455#page-18 subsection 8: "The request MUST include a header field with the name \|Origin\| [RFC6454] if the request is coming from a browser client. If the connection is from a non-browser client, the request MAY include this header field if the semantics of that client match the use-case described here for browser clients." This MP description is going to be long anyway, so please excuse me if I add some background not really related to the branch. I was curious about why the Python WebSocket client library that I traditionally used to live test the juju-core API changes (python-websocket-client) always work with the juju-core server. The answer ended up being: if no origin is provided, that library include as "Origin" in the request headers the address of the WebSocket server itself (see https://github.com/liris/websocket-client/blob/master/websocket.py#L441 lines 441-444). I am not sure this make any sense, but I decided to adopt this solution as fallback for the client in this branch, i.e.: if the browser request includes the origin header (it always should), that header is propagated; otherwise I send the juju-core API server address. To be clear, the more I think about it, the more I am convinced that this is NOT a bug in the Tornado client (which, anyway, allows for adding arbitrary headers almost easily, as shown in the code). That's it: I am really interested in your opinion. Other changes: Improved logging. Moved the message queue from the client to the server. Improved the way disconnections are handled (both browser and Juju API disconnections). Improved the way possible API connection problems are handled. Tests: Run `make unittest` from the branch root. QA: It's not required and, at this time, not easy to set up. Do it only if you are particularly interested/curious. Instructions follow. - Bootstrap juju-core, deploy and expose the juju-gui charm: juju bootstrap -e go --upload-tools juju deploy -e go cs:precise/juju-gui juju expose -e go juju-gui - Run `juju status -e go` and retrieve the bootstrap node and the juju-gui addresses. From now on, I will call the former JUJU-BOOTSTRAP-ADDRESS and the latter JUJU-GUI-ADDRESS. - Wait until the juju-gui service is started. - Get a copy of this branch: bzr branch lp:~frankban/charms/precise/juju-gui/new-ws-client/ - Copy the gui-server files in the juju-gui node by running the following command from the branch root: rsync -av server/ ubuntu@JUJU-GUI-ADDRESS:/home/ubuntu/server - Ssh into the juju-gui machine: juju ssh -e go 1 - In the juju-gui node, all the commands must be run as root: sudo -i - Stop apache and haproxy: service apache2 stop service haproxy stop - Set up the gui-server dependencies: apt-get install python-pip pip install tornado - Start the gui-server: cd /home/ubuntu/server/ python runserver.py \ --guiroot="/var/lib/juju/agents/unit-juju-gui-0/charm/juju-gui/build-prod" \ --jujuapi="wss://JUJU-BOOTSTRAP-ADDRESS:17070" - Navigate to JUJU-GUI-ADDRESS with your browser. You should be redirected to https://JUJU-GUI-ADDRESS. Accept the untrusted certificate and start playing with the GUI. - See the terminal for gui-server access logs. To enable debug logging, quit the server (CTRL-c) and restart it adding `--logging=debug` to the list of the options above. At this point the output should include the contents of the received WebSocket messages. - Done, thank you! R=teknico, gary.poster CC= https://codereview.appspot.com/11675043	Francesco Banconi	11 years ago
77	Update charm_store_url to point to new location. Update charm_store_url to point to new location. R=rharding CC= https://codereview.appspot.com/11525046	Brad Crittenden	11 years ago
76	Initial implementation of the Juju GUI server. Initial implementation of the Juju GUI server. This first cut of the server replaces the functionality provided in the charm by haproxy and apache. The server includes: - static files serving; - a WebSocket proxy handling the connections between the browser and the server and between the server and the Juju API; - HTTP to HTTPS redirecting. Further features like auth and deployer management will be added in the future. ws4py is used to implement the WebSocket client: there is something to fix there and it will be done in a future branch. At this time there is no easy way to QA the server, but tests can be run using `make unittest`: the test/lint suite is already integrated with the one used by the charm. Unfortunately the diff is quite long, sorry! R=gary.poster, bac CC= https://codereview.appspot.com/11530043	Francesco Banconi	11 years ago
75	Charm dir perms in core #1202772 Charm dir perms in core #1202772 Apache was giving a 403 when charm was deployed using core due to perms on the charm dir. R=benjamin.saller, gary.poster CC= https://codereview.appspot.com/11540043	Matthew Scott	11 years ago
74	Lint fixes. Lint fixes.	Francesco Banconi	11 years ago
73	Bumped revision up. Bumped revision up.	Francesco Banconi	11 years ago
72	Merged charmers trunk. Merged charmers trunk.	Francesco Banconi	11 years ago
71	Expose showGetJujuButton Juju GUI setting Expose showGetJujuButton Juju GUI setting This setting changes the "Logout" button to a "Get Juju" link; used only for the eventual jujucharms.com deployment. R=rharding, gary.poster CC= https://codereview.appspot.com/11301043	j.c.sackett	11 years ago

Older »