Merge lp:~rharding/charms/precise/juju-gui/remove-pyjuju into lp:~juju-gui/charms/precise/juju-gui/trunk

[Richard Harding]

Remove support for PyJuju and rapi from charm.

- Removes the support for running rapi/pyjuju.
- Removes the agent used to communicate with zookeeper.
- Removes anything pertaining to zookeeper.
- Attempts to clean up docs and such to make sense with pure juju-core.

Note:

- The functional test run was taking 62min to complete for me. The timeout is
bumped to 80min to help allow it to complete. This was against ec2.

https://codereview.appspot.com/52440043/

[Richard Harding (rharding)]

Reviewers: mp+201510_code.launchpad.net,

Message:
Please take a look.

Description:
Remove support for PyJuju and rapi from charm.

WIP - couple of question points and failing functional legacy test.

https://code.launchpad.net/~rharding/charms/precise/juju-gui/remove-pyjuju/+merge/201510

(do not edit description out of merge proposal)

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

Affected files (+90, -499 lines):
   M Dependencies.md
   M README.md
   A [revision details]
   M config.yaml
   M config/haproxy.cfg.template
   D config/juju-api-improv.conf.template
   M hooks/backend.py
   M hooks/utils.py
   M tests/20-functional.test
   M tests/test_backends.py
   M tests/test_utils.py

[lp:~rharding/charms/precise/juju-gui/remove-pyjuju]

150. By Richard Harding on 2014-01-14

Remove agent and zookeeper related functions

151. By Richard Harding on 2014-01-14

Fix lint

[Richard Harding (rharding)]

Reviewers: mp+201510_code.launchpad.net,

Message:
Please take a look.

Description:
Remove support for PyJuju and rapi from charm.

WIP - couple of question points and failing functional legacy test.

https://code.launchpad.net/~rharding/charms/precise/juju-gui/remove-pyjuju/+merge/201510

(do not edit description out of merge proposal)

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

Affected files (+92, -695 lines):
   M Dependencies.md
   M Makefile
   M README.md
   A [revision details]
   M config.yaml
   M config/haproxy.cfg.template
   D config/juju-api-agent.conf.template
   D config/juju-api-improv.conf.template
   M hooks/backend.py
   M hooks/utils.py
   M tests/20-functional.test
   M tests/test_backends.py
   M tests/test_utils.py

[Richard Harding (rharding)]

Reviewers: mp+201510_code.launchpad.net,

Message:
Please take a look.

Description:
Remove support for PyJuju and rapi from charm.

- Removes the support for running rapi/pyjuju.
- Removes the agent used to communicate with zookeeper.
- Removes anything pertaining to zookeeper.
- Attempts to clean up docs and such to make sense with pure juju-core.

Note:

- The functional test run was taking 62min to complete for me. The
timeout is
bumped to 80min to help allow it to complete. This was against ec2.

https://code.launchpad.net/~rharding/charms/precise/juju-gui/remove-pyjuju/+merge/201510

(do not edit description out of merge proposal)

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

Affected files (+92, -695 lines):
   M Dependencies.md
   M Makefile
   M README.md
   A [revision details]
   M config.yaml
   M config/haproxy.cfg.template
   D config/juju-api-agent.conf.template
   D config/juju-api-improv.conf.template
   M hooks/backend.py
   M hooks/utils.py
   M tests/20-functional.test
   M tests/test_backends.py
   M tests/test_utils.py

[Francesco Banconi (frankban)]

Thanks a lot for getting rid of all this pyJuju stuff Rick!
This branch is nice: please take a look at my comments below.
LGTM with changes.

https://codereview.appspot.com/51470044/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/51470044/diff/1/README.md#newcode76
README.md:76: core) or "admin" (for pyjuju). The password is the same as
your Juju
We can remove the pyjuju reference here.

https://codereview.appspot.com/51470044/diff/1/README.md#newcode105
README.md:105: For both Juju Core and PyJuju, you must simply do the
following steps. Note
And here too...

https://codereview.appspot.com/51470044/diff/1/README.md#newcode162
README.md:162: #### pyjuju ####
We can get rid of this paragraph and of all the juju-jitsu stuff \o/

https://codereview.appspot.com/51470044/diff/1/config/haproxy.cfg.template
File config/haproxy.cfg.template (right):

https://codereview.appspot.com/51470044/diff/1/config/haproxy.cfg.template#newcode25
config/haproxy.cfg.template:25: # Replace "/ws/" with "/" in any request
path.
Nice.

https://codereview.appspot.com/51470044/diff/1/hooks/backend.py
File hooks/backend.py (left):

https://codereview.appspot.com/51470044/diff/1/hooks/backend.py#oldcode262
hooks/backend.py:262: raise ValueError('Unable to use staging with go
backend')
I am very happy we removed this ValueError for incompatible options.

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode87
hooks/utils.py:87: Serializer, su,
Please keep "su" in its own line.

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode148
hooks/utils.py:148: return api_addresses.split()[0]
So you decided to stop supporting also old releases of juju-core.
I am not sure about this: at least we should document it more
explicitly.

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode320
hooks/utils.py:320: password = password if password else None
Maybe rewrite those three lines like the following?
if not password:
     password = 'admin' if sandbox else None

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode362
hooks/utils.py:362: # In PyJuju environments, use the same certificate
for both HTTPS and
Please remove this reference to PyJuju.

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test
File tests/20-functional.test (right):

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode45
tests/20-functional.test:45: STAGING_SERVICES = ('haproxy', 'mediawiki',
'memcached', 'mysql', 'wordpress')
STAGING_SERVICES seems to be no longer required.

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode46
tests/20-functional.test:46: juju_version().major == 0
Can't we remove this line?
Moreover, can't we remove the juju_version function entirely?

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode69
tests/20-functional.test:69: # XXX 2012-11-29 frankban bug=872264:
This XXX comment is no longer required. We can remove all the
cleanup_services machinery.

https://codereview.appspot.com/51470044/diff/1/tests/2...

[lp:~rharding/charms/precise/juju-gui/remove-pyjuju]

152. By Richard Harding on 2014-01-14

Updated per review

[Richard Harding (rharding)]

Reviewers: mp+201510_code.launchpad.net,

Message:
Please take a look.

Description:
Remove support for PyJuju and rapi from charm.

- Removes the support for running rapi/pyjuju.
- Removes the agent used to communicate with zookeeper.
- Removes anything pertaining to zookeeper.
- Attempts to clean up docs and such to make sense with pure juju-core.

Note:

- The functional test run was taking 62min to complete for me. The
timeout is
bumped to 80min to help allow it to complete. This was against ec2.

https://code.launchpad.net/~rharding/charms/precise/juju-gui/remove-pyjuju/+merge/201510

(do not edit description out of merge proposal)

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

Affected files (+107, -847 lines):
   M Dependencies.md
   M Makefile
   M README.md
   A [revision details]
   M config.yaml
   M config/haproxy.cfg.template
   D config/juju-api-agent.conf.template
   D config/juju-api-improv.conf.template
   M hooks/backend.py
   M hooks/utils.py
   M tests/20-functional.test
   M tests/helpers.py
   M tests/test_backends.py
   M tests/test_helpers.py
   M tests/test_utils.py

[Richard Harding (rharding)]

I'm fighing lbox. When I updated this it put it over at a new url.

https://codereview.appspot.com/52440043

https://codereview.appspot.com/51470044/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/51470044/diff/1/README.md#newcode76
README.md:76: core) or "admin" (for pyjuju). The password is the same as
your Juju
On 2014/01/14 17:26:36, frankban wrote:
> We can remove the pyjuju reference here.

Thanks, removed.

https://codereview.appspot.com/51470044/diff/1/README.md#newcode105
README.md:105: For both Juju Core and PyJuju, you must simply do the
following steps. Note
On 2014/01/14 17:26:36, frankban wrote:
> And here too...

Removed

https://codereview.appspot.com/51470044/diff/1/README.md#newcode162
README.md:162: #### pyjuju ####
On 2014/01/14 17:26:36, frankban wrote:
> We can get rid of this paragraph and of all the juju-jitsu stuff \o/

Removed

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode87
hooks/utils.py:87: Serializer, su,
On 2014/01/14 17:26:36, frankban wrote:
> Please keep "su" in its own line.

Mistake, thanks for the catch.

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode148
hooks/utils.py:148: return api_addresses.split()[0]
On 2014/01/14 17:26:36, frankban wrote:
> So you decided to stop supporting also old releases of juju-core.
> I am not sure about this: at least we should document it more
explicitly.

Can you talk about this more? My understanding is that we got rid of the
agent bit and that was the conf file we've removed as part of that. Is
the machiner agent file something different?

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode320
hooks/utils.py:320: password = password if password else None
On 2014/01/14 17:26:36, frankban wrote:
> Maybe rewrite those three lines like the following?
> if not password:
> password = 'admin' if sandbox else None

Tweaked.

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode362
hooks/utils.py:362: # In PyJuju environments, use the same certificate
for both HTTPS and
On 2014/01/14 17:26:36, frankban wrote:
> Please remove this reference to PyJuju.

Removed

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test
File tests/20-functional.test (right):

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode45
tests/20-functional.test:45: STAGING_SERVICES = ('haproxy', 'mediawiki',
'memcached', 'mysql', 'wordpress')
On 2014/01/14 17:26:36, frankban wrote:
> STAGING_SERVICES seems to be no longer required.

Wow, how did lint not catch that? Thanks.

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode46
tests/20-functional.test:46: juju_version().major == 0
On 2014/01/14 17:26:36, frankban wrote:
> Can't we remove this line?
> Moreover, can't we remove the juju_version function entirely?

Oh hmm, I didn't notice it was only used for pyjuju vs juju-core
distinction. Removing.

https://codereview.appspot.com/51470044/diff/1/tests/20-functional.test#newcode78
tests/20-functional.test:78: if options is None:
On 2014/0...

[Francesco Banconi (frankban)]

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/51470044/diff/1/hooks/utils.py#newcode148
hooks/utils.py:148: return api_addresses.split()[0]
On 2014/01/15 00:03:16, rharding wrote:
> On 2014/01/14 17:26:36, frankban wrote:
> > So you decided to stop supporting also old releases of juju-core.
> > I am not sure about this: at least we should document it more
explicitly.

> Can you talk about this more? My understanding is that we got rid of
the agent
> bit and that was the conf file we've removed as part of that. Is the
machiner
> agent file something different?

Those are two different concepts:
- the pyJuju API agent is the one that was started in the GUI node by
running the rapi-delta branch. The GUI used it as WebSocket server, and
the agent itself was connected to the bootstrap node Zookeper instance.
Your branch get rid of this machinery, and that's ok;
- the machiner agent file is a YAML created by juju-core which includes
the information required by the machiner worker. The API addresses are
part of that information. It must be considered an internal juju-core
detail, and for this reason we introduced the JUJU_API_ADDRESSES env
var, included in the hooks' execution context. But old versions of
juju-core don't support this, so the function strategy was:
   - try to use the environment variable;
   - if it is not present, parse the machiner agent file.
I am comfortable with that strategy, and I'd be inclined to preserve
that behavior. Anyway, as I mentioned, I can be ok in dropping support
for old juju-core releases if we clearly document it.

https://codereview.appspot.com/51470044/

[lp:~rharding/charms/precise/juju-gui/remove-pyjuju]

153. By Richard Harding on 2014-01-15

Put back agent ip address sniffing

154. By Richard Harding on 2014-01-15

Fix the force_machine time

155. By Richard Harding on 2014-01-15

Update force machine and set timeout back to 40m.

=== modified file 'Dependencies.md'
--- Dependencies.md	2013-07-16 15:30:33 +0000
+++ Dependencies.md	2014-01-15 14:49:45 +0000
@@ -14,8 +14,7 @@
 a single PPA that the Juju GUI charm developers maintain.
 
 The packages in our devel PPA provide a superset of all software the charm may
-need for different deployment strategies, such as using the sandbox
-vs. improv, or Python Juju vs. Go Juju.
+need for different deployment strategies, such as using the sandbox or Go Juju.
 
 # Stable and Devel #
 
 
=== modified file 'README.md'
--- README.md	2013-10-08 15:30:04 +0000
+++ README.md	2014-01-15 14:49:45 +0000
@@ -72,9 +72,9 @@
 By default, the deployment uses self-signed certificates. The browser will ask
 you to accept a security exception once.
 
-You will see a login form with the username fixed to "user-admin" (for juju-
-core) or "admin" (for pyjuju). The password is the same as your Juju
-environment's `admin-secret`, found in `~/.juju/environments.yaml`.
+You will see a login form with the username fixed to "user-admin". The
+password is the same as your Juju environment's `admin-secret`, found in
+`~/.juju/environments.yaml`.
 
 ### Deploying behind a firewall ###
 
@@ -102,9 +102,6 @@
 deploy behind a firewall configuring the charm to pull the GUI release from a
 location you specify.
 
-For both Juju Core and PyJuju, you must simply do the following steps.  Note
-that PyJuju must do these steps, plus another set described further below.
-
 The config variable `juju-gui-source` allows a `url:` prefix which understands
 both `http://` and `file://` protocols.  We will use this to load a local copy
 of the GUI source.
@@ -125,14 +122,7 @@
 
     `juju resolved --retry juju-gui/0`
 
-These steps are sufficient for Juju Core.  If you are using PyJuju, you need to
-do another set of steps in addition.
-
-1. Use bzr to branch lp:~hazmat/juju/rapi-rollup locally ("bzr branch
-lp:~hazmat/juju/rapi-rollup") and copy the branch to the gui service machine.
-
-2. Use "juju set juju-gui juju-api-branch=PATH_TO_LOCAL_BZR_BRANCH" (where the
-path is *not* a file:// URI).
+These steps are sufficient for Juju Core.
 
 3. Retry as described in the step 3 above (`juju resolved --retry juju-gui/0`).
 
@@ -166,18 +156,6 @@
 
     juju deploy --force-machine 0 cs:precise/juju-gui
 
-#### pyjuju ####
-
-Colocation support is not included by default in the pyjuju implementation; to
-activate it, you will need to install Jitsu:
-
-    sudo apt-get install juju-jitsu
-
-and then replace "juju deploy cs:precise/juju-gui" from the previous
-instructions with this:
-
-    jitsu deploy-to 0 cs:precise/juju-gui
-
 ## Contacting the Developers ##
 
 If you run into problems with the charm, please feel free to contact us on the
 
=== modified file 'config.yaml'
--- config.yaml	2014-01-09 21:48:27 +0000
+++ config.yaml	2014-01-15 14:49:45 +0000
@@ -36,7 +36,7 @@
         deployed from the specified Bazaar branch. "http://"" prefixed branches
         work as well. It is also possible to include the specific branch
         revision, e.g. "lp:juju-gui:42" will checkout revno 42.
-      - a "url:"" prefixed url: The release found at the given URL
+      - a "url:" prefixed url: The release found at the given URL
         (ex: url:http://... or url:file://...) will be deployed.
     type: string
     default: local
@@ -45,30 +45,6 @@
       Run Juju GUI in debug mode, serving the uncompressed GUI source files.
     type: boolean
     default: false
-  juju-api-branch:
-    description: |
-      The Juju API Bazaar branch (implementing the WebSocket server).  Since
-      juju-core includes the WebSocket API server out of the box, this option
-      is ignored if the charm is deployed using juju-core.
-    type: string
-    default: lp:~hazmat/juju/rapi-rollup
-  staging:
-    description: |
-      Connect the Juju GUI to the staging backend (i.e. a simulated Juju
-      environment).  Currently juju-core does not support the staging backend.
-      For this reason, an error is raised if this option is enabled in a
-      juju-core environment.
-    type: boolean
-    default: false
-  staging-environment:
-    description: |
-      The environment JSON export used by the staging server. This option can
-      be used to change the topology of the simulated Juju environment.
-      Possible values are 'sample' and 'large'.  Currently juju-core does not
-      support the staging backend. For this reason, this option is ignored if
-      the charm is deployed using juju-core.
-    type: string
-    default: sample
   juju-gui-console-enabled:
     description: |
       Whether or not the console should be enabled for the browser.
@@ -132,11 +108,9 @@
     type: string
   sandbox:
     description: |
-      Run using an in-memory sandbox rather than a real (or even improv) Juju
-      backend.  Sandbox is a client side construct running entirely in the
-      client. Sandbox does not currently support imported environment
-      simulation and is exclusive to the staging: true configuration. If
-      staging is true it will be used in preference to sandbox at this time.
+      Run using an in-memory sandbox rather than a real Juju backend. Sandbox
+      is a client side construct running entirely in the client. Sandbox does
+      not currently support imported environment simulation.
     type: boolean
     default: false
   charmworld-url:
 
=== modified file 'config/haproxy.cfg.template'
--- config/haproxy.cfg.template	2013-03-28 09:39:45 +0000
+++ config/haproxy.cfg.template	2014-01-15 14:49:45 +0000
@@ -22,13 +22,9 @@
 backend juju
     # The Juju WebSocket backend.
     # Re-encrypt outgoing connections.
-    {{if legacy_juju}}
-        server ws1 {{api_address}} ssl ca-file {{api_pem}} verify required check-ssl inter 500ms
-    {{else}}
-        # Replace "/ws/" with "/" in any request path.
-        reqrep ^([^\ ]*)\ /ws/    \1\ /
-        server ws1 {{api_address}} ssl check-ssl inter 500ms
-    {{endif}}
+    # Replace "/ws/" with "/" in any request path.
+    reqrep ^([^\ ]*)\ /ws/    \1\ /
+    server ws1 {{api_address}} ssl check-ssl inter 500ms
 
 backend web
     # Web traffic.
 
=== removed file 'config/juju-api-agent.conf.template'
--- config/juju-api-agent.conf.template	2013-05-22 15:22:53 +0000
+++ config/juju-api-agent.conf.template	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Juju API agent"
-author "Canonical"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-env JUJU_ZOOKEEPER={{zookeeper}}
-
-# Fix for bug 1130681: when the environment sets "juju-origin: lp:juju",
-# easy_install mucks sys.path and the juju libs are not found, unless we
-# change to their directory so that it comes first in sys.path.
-chdir {{juju_dir}}
-
-# Use --nodaemon so that upstart can correctly retrieve the process ID.
-exec /usr/bin/python -m juju.agents.api --nodaemon --port {{port}} \
-    --logfile /var/log/juju/api-agent.log \
-    --session-file /var/run/juju/api-agent.zksession \
-    --secure --keys {{keys}} {{if read_only}} --read-only {{endif}}
 
=== removed file 'config/juju-api-improv.conf.template'
--- config/juju-api-improv.conf.template	2013-02-04 17:26:32 +0000
+++ config/juju-api-improv.conf.template	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-description "Juju API staging"
-author "Canonical"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-setuid ubuntu
-env PYTHONPATH={{juju_dir}}:$PYTHONPATH
-
-exec /usr/bin/python {{juju_dir}}/improv.py --port {{port}} \
-    -f {{juju_dir}}/{{staging_env}}.json \
-    --secure --keys {{keys}}
 
=== modified file 'hooks/backend.py'
--- hooks/backend.py	2014-01-09 21:48:27 +0000
+++ hooks/backend.py	2014-01-15 14:49:45 +0000
@@ -67,43 +67,10 @@
         shutil.rmtree(utils.BASE_DIR)
 
 
-class PythonInstallMixinBase(object):
-    """Provide a common "install" method to ImprovMixin and PythonMixin."""
-
-    def install(self, backend):
-        if (not os.path.exists(utils.JUJU_AGENT_DIR) or
-                backend.different('staging', 'juju-api-branch')):
-            utils.fetch_api(backend.config['juju-api-branch'])
-
-
-class ImprovMixin(PythonInstallMixinBase):
-    """Manage the improv backend when on staging."""
-
-    debs = ('zookeeper',)
-
-    def start(self, backend):
-        config = backend.config
-        utils.start_improv(
-            config['staging-environment'], config['ssl-cert-path'])
-
-    def stop(self, backend):
-        utils.stop_improv()
-
-
 class SandboxMixin(object):
     pass
 
 
-class PythonMixin(PythonInstallMixinBase):
-    """Manage the real PyJuju backend."""
-
-    def start(self, backend):
-        utils.start_agent(backend.config['ssl-cert-path'])
-
-    def stop(self, backend):
-        utils.stop_agent()
-
-
 class GoMixin(object):
     """Manage the real Go juju-core backend."""
     pass
@@ -149,7 +116,7 @@
             config['juju-gui-debug'], config['serve-tests'])
         utils.write_gui_config(
             config['juju-gui-console-enabled'], config['login-help'],
-            config['read-only'], config['staging'], config['charmworld-url'],
+            config['read-only'], config['charmworld-url'],
             build_dir, secure=config['secure'], sandbox=config['sandbox'],
             ga_key=config['ga-key'],
             show_get_juju_button=config['show-get-juju-button'],
@@ -255,16 +222,10 @@
         self.prev_config = prev_config
         self.mixins = [SetUpMixin()]
 
-        is_legacy_juju = utils.legacy_juju()
-
-        if config['staging']:
-            if not is_legacy_juju:
-                raise ValueError('Unable to use staging with go backend')
-            self.mixins.append(ImprovMixin())
-        elif config['sandbox']:
+        if config['sandbox']:
             self.mixins.append(SandboxMixin())
         else:
-            mixin = PythonMixin() if is_legacy_juju else GoMixin()
+            mixin = GoMixin()
             self.mixins.append(mixin)
 
         # We always install and start the GUI.
 
=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-01-13 16:53:45 +0000
+++ hooks/utils.py	2014-01-15 14:49:45 +0000
@@ -21,14 +21,12 @@
     'APACHE_PORTS',
     'API_PORT',
     'CURRENT_DIR',
-    'JUJU_AGENT_DIR',
     'JUJU_GUI_DIR',
     'JUJU_PEM',
     'WEB_PORT',
     'cmd_log',
     'compute_build_dir',
     'download_release',
-    'fetch_api',
     'fetch_gui_from_branch',
     'fetch_gui_release',
     'find_missing_packages',
@@ -37,9 +35,7 @@
     'get_launchpad_release',
     'get_npm_cache_archive_url',
     'get_release_file_path',
-    'get_zookeeper_address',
     'install_missing_packages',
-    'legacy_juju',
     'log_hook',
     'parse_source',
     'prime_npm_cache',
@@ -50,14 +46,10 @@
     'setup_apache_config',
     'setup_gui',
     'setup_haproxy_config',
-    'start_agent',
     'start_builtin_server',
     'start_haproxy_apache',
-    'start_improv',
-    'stop_agent',
     'stop_builtin_server',
     'stop_haproxy_apache',
-    'stop_improv',
     'write_gui_config',
 ]
 
@@ -72,18 +64,17 @@
 from subprocess import CalledProcessError
 import tempfile
 import urlparse
+import yaml
 
 import apt
 from launchpadlib.launchpad import Launchpad
 import tempita
-import yaml
 
 from charmhelpers import (
     get_config,
     log,
     RESTART,
     service_control,
-    START,
     STOP,
     unit_get,
 )
@@ -94,17 +85,14 @@
     install_extra_repositories,
     run,
     script_name,
-    search_file,
     Serializer,
     su,
 )
 
 
-AGENT = 'juju-api-agent'
 APACHE = 'apache2'
 BUILTIN_SERVER = 'guiserver'
 HAPROXY = 'haproxy'
-IMPROV = 'juju-api-improv'
 
 API_PORT = 8080
 WEB_PORT = 8000
@@ -112,7 +100,6 @@
 BASE_DIR = '/var/lib/juju-gui'
 CURRENT_DIR = os.getcwd()
 CONFIG_DIR = os.path.join(CURRENT_DIR, 'config')
-JUJU_AGENT_DIR = os.path.join(BASE_DIR, 'juju')
 JUJU_GUI_DIR = os.path.join(BASE_DIR, 'juju-gui')
 RELEASES_DIR = os.path.join(CURRENT_DIR, 'releases')
 SERVER_DIR = os.path.join(CURRENT_DIR, 'server')
@@ -123,10 +110,8 @@
 HAPROXY_CFG_PATH = os.path.join(os.path.sep, 'etc', 'haproxy', 'haproxy.cfg')
 
 SYS_INIT_DIR = os.path.join(os.path.sep, 'etc', 'init')
-AGENT_INIT_PATH = os.path.join(SYS_INIT_DIR, 'juju-api-agent.conf')
 GUISERVER_INIT_PATH = os.path.join(SYS_INIT_DIR, 'guiserver.conf')
 HAPROXY_INIT_PATH = os.path.join(SYS_INIT_DIR, 'haproxy.conf')
-IMPROV_INIT_PATH = os.path.join(SYS_INIT_DIR, 'juju-api-improv.conf')
 
 JUJU_PEM = 'juju.includes-private-key.pem'
 DEB_BUILD_DEPENDENCIES = (
@@ -138,11 +123,6 @@
 config_json = Serializer(os.path.join(os.path.sep, 'tmp', 'config.json'))
 # Bazaar checkout command.
 bzr_checkout = command('bzr', 'co', '--lightweight')
-# Whether or not the charm is deployed using juju-core.
-# If juju-core has been used to deploy the charm, an agent.conf file must
-# be present in the charm parent directory.
-legacy_juju = lambda: not os.path.exists(
-    os.path.join(CURRENT_DIR, '..', 'agent.conf'))
 
 bzr_url_expression = re.compile(r"""
     ^  # Beginning of line.
@@ -165,8 +145,6 @@
 def get_api_address(unit_dir=None):
     """Return the Juju API address.
 
-    If not present in the hook context as an environment variable, try to
-    retrieve the address parsing the machiner agent.conf file.
     """
     api_addresses = os.getenv('JUJU_API_ADDRESSES')
     if api_addresses is not None:
@@ -187,6 +165,7 @@
         raise IOError('Juju agent configuration file not found.')
     contents = yaml.load(open(agent_conf))
     return contents['apiinfo']['addrs'][0]
+    return api_addresses.split()[0]
 
 
 def first_path_in_dir(directory):
@@ -235,18 +214,6 @@
     raise ValueError('%r: file not found' % release_version)
 
 
-def get_zookeeper_address(agent_file_path):
-    """Retrieve the Zookeeper address contained in the given *agent_file_path*.
-
-    The *agent_file_path* is a path to a file containing a line similar to the
-    following::
-
-        env JUJU_ZOOKEEPER="address"
-    """
-    line = search_file('JUJU_ZOOKEEPER', agent_file_path).strip()
-    return line.split('=')[1].strip('"')
-
-
 @contextmanager
 def log_hook():
     """Log when a hook starts and stops its execution.
@@ -346,60 +313,6 @@
     results_log.info('\n' + results)
 
 
-def start_improv(staging_env, ssl_cert_path):
-    """Start a simulated juju environment using ``improv.py``."""
-    log('Setting up the staging Upstart script.')
-    context = {
-        'juju_dir': JUJU_AGENT_DIR,
-        'keys': ssl_cert_path,
-        'port': API_PORT,
-        'staging_env': staging_env,
-    }
-    render_to_file('juju-api-improv.conf.template', context, IMPROV_INIT_PATH)
-    log('Starting the staging backend.')
-    with su('root'):
-        service_control(IMPROV, START)
-
-
-def stop_improv():
-    """Stop a simulated Juju environment."""
-    log('Stopping the staging backend.')
-    with su('root'):
-        service_control(IMPROV, STOP)
-    log('Removing the staging Upstart script.')
-    cmd_log(run('rm', '-f', IMPROV_INIT_PATH))
-
-
-def start_agent(ssl_cert_path, read_only=False):
-    """Start the Juju agent and connect to the current environment."""
-    # Retrieve the Zookeeper address from the start up script.
-    unit_name = os.path.basename(
-        os.path.realpath(os.path.join(CURRENT_DIR, '..')))
-    agent_file = os.path.join(SYS_INIT_DIR, 'juju-{}.conf'.format(unit_name))
-    zookeeper = get_zookeeper_address(agent_file)
-    log('Setting up the API agent Upstart script.')
-    context = {
-        'juju_dir': JUJU_AGENT_DIR,
-        'keys': ssl_cert_path,
-        'port': API_PORT,
-        'zookeeper': zookeeper,
-        'read_only': read_only
-    }
-    render_to_file('juju-api-agent.conf.template', context, AGENT_INIT_PATH)
-    log('Starting the API agent.')
-    with su('root'):
-        service_control(AGENT, START)
-
-
-def stop_agent():
-    """Stop the Juju agent."""
-    log('Stopping the API agent.')
-    with su('root'):
-        service_control(AGENT, STOP)
-    log('Removing the API agent Upstart script.')
-    cmd_log(run('rm', '-f', AGENT_INIT_PATH))
-
-
 def compute_build_dir(juju_gui_debug, serve_tests):
     """Compute the build directory."""
     with su('root'):
@@ -416,19 +329,21 @@
 
 
 def write_gui_config(
-        console_enabled, login_help, readonly, in_staging, charmworld_url,
+        console_enabled, login_help, readonly, charmworld_url,
         build_dir, secure=True, sandbox=False,
         show_get_juju_button=False, config_js_path=None, ga_key='',
         password=None):
     """Generate the GUI configuration file."""
     log('Generating the Juju GUI configuration file.')
-    is_legacy_juju = legacy_juju()
-    user = 'admin' if is_legacy_juju else 'user-admin'
-    # Normalize empty string passwords to None.
-    password = password if password else None
-    if password is None and ((is_legacy_juju and in_staging) or sandbox):
-        password = 'admin'
-    api_backend = 'python' if (is_legacy_juju and not sandbox) else 'go'
+    user = 'user-admin'
+    # Normalize empty string passwords to None. If sandbox is enabled then set
+    # the password to admin and it will auto login.
+    if not password:
+        if sandbox:
+            password = 'admin'
+        else:
+            password = None
+    api_backend = 'go'
     if secure:
         protocol = 'wss'
     else:
@@ -461,21 +376,12 @@
     config_path = os.path.join(CONFIG_DIR, 'haproxy.conf')
     shutil.copy(config_path, SYS_INIT_DIR)
     log('Generating haproxy configuration file.')
-    is_legacy_juju = legacy_juju()
-    if is_legacy_juju:
-        # The PyJuju API agent is listening on localhost.
-        api_address = '127.0.0.1:{}'.format(API_PORT)
-    else:
-        # Retrieve the juju-core API server address.
-        api_address = get_api_address()
+    # Retrieve the juju-core API server address.
+    api_address = get_api_address()
     context = {
         'api_address': api_address,
         'api_pem': JUJU_PEM,
-        'legacy_juju': is_legacy_juju,
         'ssl_cert_path': ssl_cert_path,
-        # In PyJuju environments, use the same certificate for both HTTPS and
-        # WebSocket connections. In juju-core the system already has the proper
-        # certificate installed.
         'web_pem': JUJU_PEM,
         'web_port': WEB_PORT,
         'secure': secure
@@ -577,14 +483,10 @@
         'charmworld_url': charmworld_url,
     }
     if not sandbox:
-        is_legacy_juju = legacy_juju()
-        if is_legacy_juju:
-            api_url = 'wss://127.0.0.1:{}/ws'.format(API_PORT)
-        else:
-            api_url = 'wss://{}'.format(get_api_address())
+        api_url = 'wss://{}'.format(get_api_address())
         context.update({
             'api_url': api_url,
-            'api_version': 'python' if is_legacy_juju else 'go',
+            'api_version': 'go',
         })
     if serve_tests:
         context['tests_root'] = os.path.join(JUJU_GUI_DIR, 'test', '')
@@ -737,14 +639,6 @@
     return download_release(url, filename)
 
 
-def fetch_api(juju_api_branch):
-    """Retrieve the Juju branch, removing it first if already there."""
-    # Retrieve Juju API source checkout.
-    log('Retrieving Juju API source checkout.')
-    cmd_log(run('rm', '-rf', JUJU_AGENT_DIR))
-    cmd_log(bzr_checkout(juju_api_branch, JUJU_AGENT_DIR))
-
-
 def setup_gui(release_tarball):
     """Set up Juju GUI."""
     # Uncompress the release tarball.
 
=== modified file 'tests/20-functional.test'
--- tests/20-functional.test	2013-11-27 15:20:58 +0000
+++ tests/20-functional.test	2014-01-15 14:49:45 +0000
@@ -35,16 +35,12 @@
 from helpers import (
     get_admin_secret,
     juju_destroy_service,
-    juju_version,
     make_service_name,
-    stop_services,
     WebSocketClient,
 )
 import example
 
 JUJU_GUI_TEST_BRANCH = 'lp:~juju-gui/juju-gui/charm-tests-branch'
-STAGING_SERVICES = ('haproxy', 'mediawiki', 'memcached', 'mysql', 'wordpress')
-is_legacy_juju = juju_version().major == 0
 try:
     admin_secret = get_admin_secret()
 except ValueError as err:
@@ -62,33 +58,18 @@
     of services that are started in the Juju GUI unit and that must be
     manually stopped by tests. In juju-core, the services list is always empty.
     """
-    force_machine = None if is_legacy_juju else 0
     service_name = make_service_name(prefix='juju-gui-')
     unit_info = juju_deploy(
         'juju-gui', service_name=service_name, options=options,
-        force_machine=force_machine)
-    # XXX 2012-11-29 frankban bug=872264:
-        # Just invoking ``juju destroy-service juju-gui`` in tearDown
-        # should execute the ``stop`` hook, stopping all the services
-        # started by the charm in the machine. Right now this does not
-        # work in pyJuju, so the desired effect is achieved by keeping
-        # track of started services and manually stopping them here.
-    # Once pyJuju works correctly or we drop support for it altogether, we
-    # can remove this shim.
+        force_machine=0)
     cleanup_services = []
-    if is_legacy_juju:
-        if options is None:
-            options = {}
-        # Either stop the builtin server or the old apache2/haproxy setup.
-        if options.get('builtin-server') == 'true':
-            cleanup_services.append('guiserver')
-        else:
-            cleanup_services.extend(['haproxy', 'apache2'])
-        # Staging uses improv, otherwise the API agent is used.
-        if options.get('staging') == 'true':
-            cleanup_services.append('juju-api-improv')
-        else:
-            cleanup_services.append('juju-api-agent')
+    if options is None:
+        options = {}
+    # Either stop the builtin server or the old apache2/haproxy setup.
+    if options.get('builtin-server') == 'true':
+        cleanup_services.append('guiserver')
+    else:
+        cleanup_services.extend(['haproxy', 'apache2'])
     return service_name, unit_info, cleanup_services
 
 
@@ -177,19 +158,6 @@
         services = self.wait_for(services_found, 'Services not displayed.')
         return set([element.text for element in services])
 
-    def deploy_gui(self, options=None):
-        """Shim in our additional cleanup for pyJuju."""
-        # Once pyJuju works correctly or we drop support for it altogether, we
-        # can remove this shim.
-        self.service_name, unit_info, cleanup_services = juju_deploy_gui(
-            options=options)
-        # XXX 2013-11-27 frankban bug=872264:
-            # See juju_deploy_gui above.
-        if is_legacy_juju:
-            hostname = unit_info['public-address']
-            self.addCleanup(stop_services, hostname, cleanup_services)
-        return unit_info
-
     def get_builtin_server_info(self, hostname):
         """Return a dictionary of info as exposed by the builtin server."""
         url = 'https://{}/gui-server-info'.format(hostname)
@@ -205,26 +173,17 @@
 
     def test_stable_release(self):
         # Ensure the stable Juju GUI release is correctly set up.
-        unit_info = self.deploy_gui(options={'juju-gui-source': 'stable'})
-        hostname = unit_info['public-address']
-        self.navigate_to(hostname)
-        self.handle_browser_warning()
-        self.assertEnvironmentIsConnected()
-
-    @unittest.skipUnless(is_legacy_juju, 'staging only works in pyJuju')
-    def test_staging(self):
-        # Ensure the Juju GUI and staging services are correctly set up.
-        unit_info = self.deploy_gui(options={'staging': 'true'})
-        hostname = unit_info['public-address']
-        self.navigate_to(hostname)
-        self.handle_browser_warning()
-        self.assertEnvironmentIsConnected()
-        # The staging environment contains five deployed services.
-        self.assertSetEqual(set(STAGING_SERVICES), self.get_service_names())
+        self.service_name, unit_info, _ = juju_deploy_gui(
+            options={'juju-gui-source': 'stable'})
+        hostname = unit_info['public-address']
+        self.navigate_to(hostname)
+        self.handle_browser_warning()
+        self.assertEnvironmentIsConnected()
 
     def test_sandbox(self):
         # The GUI is correctly deployed and set up in sandbox mode.
-        unit_info = self.deploy_gui(options={'sandbox': 'true'})
+        self.service_name, unit_info, _ = juju_deploy_gui(
+            options={'sandbox': 'true'})
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
         self.handle_browser_warning()
@@ -236,7 +195,7 @@
     def test_branch_source(self):
         # Ensure the Juju GUI is correctly deployed from a Bazaar branch.
         options = {'juju-gui-source': JUJU_GUI_TEST_BRANCH}
-        unit_info = self.deploy_gui(options=options)
+        self.service_name, unit_info, _ = juju_deploy_gui(options=options)
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
         self.handle_browser_warning()
@@ -245,7 +204,8 @@
     def test_legacy_server(self):
         # The legacy apache + haproxy server configuration works correctly.
         # Also make sure the correct cache headers are sent.
-        unit_info = self.deploy_gui(options={'builtin-server': 'false'})
+        self.service_name, unit_info, _ = juju_deploy_gui(
+            options={'builtin-server': 'false'})
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
         self.handle_browser_warning()
@@ -279,10 +239,6 @@
         # Destroy the GUI service, and perform additional clean up in the case
         # we are in a pyJuju environment.
         juju_destroy_service(cls.service_name)
-        # XXX 2013-11-27 frankban bug=872264:
-            # See juju_deploy_gui above.
-        if is_legacy_juju:
-            stop_services(cls.hostname, cls.cleanup_services)
 
     def make_websocket_client(self, authenticated=True):
         """Create and return a WebSocket client connected to the Juju backend.
@@ -320,8 +276,6 @@
         server_header = dict(headers)['server']
         self.assertIn('TornadoServer', server_header)
 
-    @unittest.skipIf(
-        is_legacy_juju, 'bundle deployments are only supported in juju-core')
     def test_deployer_not_authenticated(self):
         # An error is returned trying to start a bundle deployment without
         # being authenticated.
@@ -337,8 +291,6 @@
             'unauthorized access: no user logged in', response['Error'])
 
     @unittest.skipUnless(admin_secret, 'admin secret was not found')
-    @unittest.skipIf(
-        is_legacy_juju, 'bundle deployments are only supported in juju-core')
     def test_deployer_invalid_bundle_name(self):
         # An error is returned trying to deploy a bundle with an invalid name.
         client = self.make_websocket_client()
@@ -353,8 +305,6 @@
             'invalid request: bundle no-such not found', response['Error'])
 
     @unittest.skipUnless(admin_secret, 'admin secret was not found')
-    @unittest.skipIf(
-        is_legacy_juju, 'bundle deployments are only supported in juju-core')
     def test_deployer_invalid_bundle_yaml(self):
         # An error is returned trying to deploy an invalid bundle YAML.
         client = self.make_websocket_client()
@@ -369,8 +319,6 @@
             'invalid request: invalid YAML contents', response['Error'])
 
     @unittest.skipUnless(admin_secret, 'admin secret was not found')
-    @unittest.skipIf(
-        is_legacy_juju, 'bundle deployments are only supported in juju-core')
     def test_deployer_watch_unknown_deployment(self):
         # An error is returned trying to watch an unknown deployment.
         client = self.make_websocket_client()
@@ -385,8 +333,6 @@
             'invalid request: deployment not found', response['Error'])
 
     @unittest.skipUnless(admin_secret, 'admin secret was not found')
-    @unittest.skipIf(
-        is_legacy_juju, 'bundle deployments are only supported in juju-core')
     def test_deployer(self):
         # The builtin server supports deploying bundles using juju-deployer.
         client = self.make_websocket_client()
 
=== modified file 'tests/helpers.py'
--- tests/helpers.py	2013-11-27 14:37:06 +0000
+++ tests/helpers.py	2014-01-15 14:49:45 +0000
@@ -21,7 +21,6 @@
 import json
 import os
 import random
-import re
 import string
 import subprocess
 import time
@@ -172,36 +171,6 @@
     return json.loads(status)
 
 
-_juju_version_expression = re.compile(r"""
-    ^  # Beginning of line.
-    (?:juju\s+)?  # Optional juju prefix.
-    (\d+)\.(\d+)  # Major and minor versions.
-    (?:\.(\d+))?  # Optional patch version.
-    .*  # Optional suffix.
-    $  # End of line.
-""", re.VERBOSE)
-
-
-def juju_version():
-    """Return the currently used Juju version.
-
-    The version is returned as a named tuple (major, minor, patch).
-    If the patch number is missing, it is set to zero.
-    """
-    try:
-        # In pyJuju, version info is printed to stderr.
-        output = subprocess.check_output(
-            ['juju', '--version'], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError:
-        # Current juju-core exposes a version subcommand.
-        output = subprocess.check_output(['juju', 'version'])
-    match = _juju_version_expression.match(output)
-    if match is None:
-        raise ValueError('invalid juju version: {!r}'.format(output))
-    to_int = lambda num: 0 if num is None else int(num)
-    return Version._make(map(to_int, match.groups()))
-
-
 def make_service_name(prefix='service-'):
     """Generate a long, random service name."""
     characters = string.ascii_lowercase
 
=== modified file 'tests/test_backends.py'
--- tests/test_backends.py	2014-01-09 21:48:27 +0000
+++ tests/test_backends.py	2014-01-15 14:49:45 +0000
@@ -38,10 +38,6 @@
     'curl', 'openssl', 'python-bzrlib', 'python-pip')
 EXPECTED_GO_BUILTIN_DEBS = ('curl', 'openssl', 'python-bzrlib', 'python-pip')
 
-simulate_pyjuju = mock.patch('utils.legacy_juju', mock.Mock(return_value=True))
-simulate_juju_core = mock.patch(
-    'utils.legacy_juju', mock.Mock(return_value=False))
-
 
 class TestBackendProperties(unittest.TestCase):
     """Ensure the correct mixins and property values are collected."""
@@ -66,59 +62,14 @@
             'builtin-server': False,
             'repository-location': 'ppa:my/location',
             'sandbox': True,
-            'staging': False,
         }
         test_backend = backend.Backend(config=config)
         self.assert_mixins(expected_mixins, test_backend)
         self.assert_dependencies(
             EXPECTED_PYTHON_LEGACY_DEBS, 'ppa:my/location', test_backend)
 
-    def test_python_staging_backend(self):
-        expected_mixins = (
-            'SetUpMixin', 'ImprovMixin', 'GuiMixin', 'HaproxyApacheMixin')
-        config = {
-            'builtin-server': False,
-            'repository-location': 'ppa:my/location',
-            'sandbox': False,
-            'staging': True,
-        }
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_PYTHON_LEGACY_DEBS + ('zookeeper',),
-                'ppa:my/location', test_backend)
-
-    def test_go_staging_backend(self):
-        config = {'sandbox': False, 'staging': True, 'builtin-server': False}
-        with simulate_juju_core:
-            with self.assertRaises(ValueError) as context_manager:
-                backend.Backend(config=config)
-        error = str(context_manager.exception)
-        self.assertEqual('Unable to use staging with go backend', error)
-
-    def test_python_sandbox_backend(self):
-        with simulate_pyjuju:
-            self.check_sandbox_mode()
-
     def test_go_sandbox_backend(self):
-        with simulate_juju_core:
-            self.check_sandbox_mode()
-
-    def test_python_backend(self):
-        expected_mixins = (
-            'SetUpMixin', 'PythonMixin', 'GuiMixin', 'HaproxyApacheMixin')
-        config = {
-            'builtin-server': False,
-            'repository-location': 'ppa:my/location',
-            'sandbox': False,
-            'staging': False,
-        }
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_PYTHON_LEGACY_DEBS, 'ppa:my/location', test_backend)
+        self.check_sandbox_mode()
 
     def test_go_backend(self):
         expected_mixins = (
@@ -127,58 +78,37 @@
             'builtin-server': False,
             'repository-location': 'ppa:my/location',
             'sandbox': False,
-            'staging': False,
         }
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_GO_LEGACY_DEBS, 'ppa:my/location', test_backend)
+        test_backend = backend.Backend(config=config)
+        self.assert_mixins(expected_mixins, test_backend)
+        self.assert_dependencies(
+            EXPECTED_GO_LEGACY_DEBS, 'ppa:my/location', test_backend)
 
     def test_go_builtin_server(self):
         config = {
             'builtin-server': True,
             'repository-location': 'ppa:my/location',
             'sandbox': False,
-            'staging': False,
         }
         expected_mixins = (
             'SetUpMixin', 'GoMixin', 'GuiMixin', 'BuiltinServerMixin')
-        with simulate_juju_core:
-            test_backend = backend.Backend(config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_GO_BUILTIN_DEBS, None, test_backend)
-
-    def test_python_builtin_server(self):
-        config = {
-            'builtin-server': True,
-            'repository-location': 'ppa:my/location',
-            'sandbox': False,
-            'staging': False,
-        }
-        expected_mixins = (
-            'SetUpMixin', 'PythonMixin', 'GuiMixin', 'BuiltinServerMixin')
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_PYTHON_BUILTIN_DEBS, None, test_backend)
+        test_backend = backend.Backend(config)
+        self.assert_mixins(expected_mixins, test_backend)
+        self.assert_dependencies(
+            EXPECTED_GO_BUILTIN_DEBS, None, test_backend)
 
     def test_sandbox_builtin_server(self):
         config = {
             'builtin-server': True,
             'repository-location': 'ppa:my/location',
             'sandbox': True,
-            'staging': False,
         }
         expected_mixins = (
             'SetUpMixin', 'SandboxMixin', 'GuiMixin', 'BuiltinServerMixin')
-        with simulate_juju_core:
-            test_backend = backend.Backend(config)
-            self.assert_mixins(expected_mixins, test_backend)
-            self.assert_dependencies(
-                EXPECTED_PYTHON_BUILTIN_DEBS, None, test_backend)
+        test_backend = backend.Backend(config)
+        self.assert_mixins(expected_mixins, test_backend)
+        self.assert_dependencies(
+            EXPECTED_PYTHON_BUILTIN_DEBS, None, test_backend)
 
 
 class TestBackendCommands(unittest.TestCase):
@@ -189,10 +119,8 @@
         self.addCleanup(shutil.rmtree, self.playground)
         self.base_dir = os.path.join(self.playground, 'juju-gui')
         self.command_log_file = os.path.join(self.playground, 'logs')
-        self.juju_agent_dir = os.path.join(self.playground, 'juju-agent-dir')
         self.ssl_cert_path = os.path.join(self.playground, 'ssl-cert-path')
         # Set up default values.
-        self.juju_api_branch = 'lp:juju-api'
         self.juju_gui_source = 'stable'
         self.repository_location = 'ppa:my/location'
         self.parse_source_return_value = ('stable', None)
@@ -205,7 +133,6 @@
             'charmworld-url': 'http://charmworld.example.com/',
             'command-log-file': self.command_log_file,
             'ga-key': 'my-key',
-            'juju-api-branch': self.juju_api_branch,
             'juju-gui-debug': False,
             'juju-gui-console-enabled': False,
             'juju-gui-source': self.juju_gui_source,
@@ -217,7 +144,6 @@
             'serve-tests': False,
             'show-get-juju-button': False,
             'ssl-cert-path': self.ssl_cert_path,
-            'staging': False,
         }
         if options is not None:
             config.update(options)
@@ -231,7 +157,6 @@
         mocks = {
             'base_dir': mock.patch('backend.utils.BASE_DIR', self.base_dir),
             'compute_build_dir': mock.patch('backend.utils.compute_build_dir'),
-            'fetch_api': mock.patch('backend.utils.fetch_api'),
             'fetch_gui_from_branch': mock.patch(
                 'backend.utils.fetch_gui_from_branch'),
             'fetch_gui_release': mock.patch('backend.utils.fetch_gui_release'),
@@ -239,8 +164,6 @@
                 'backend.utils.install_builtin_server'),
             'install_missing_packages': mock.patch(
                 'backend.utils.install_missing_packages'),
-            'juju_agent_dir': mock.patch(
-                'backend.utils.JUJU_AGENT_DIR', self.juju_agent_dir),
             'log': mock.patch('backend.log'),
             'open_port': mock.patch('backend.open_port'),
             'parse_source': mock.patch(
@@ -248,12 +171,10 @@
             'save_or_create_certificates': mock.patch(
                 'backend.utils.save_or_create_certificates'),
             'setup_gui': mock.patch('backend.utils.setup_gui'),
-            'start_agent': mock.patch('backend.utils.start_agent'),
             'start_builtin_server': mock.patch(
                 'backend.utils.start_builtin_server'),
             'start_haproxy_apache': mock.patch(
                 'backend.utils.start_haproxy_apache'),
-            'stop_agent': mock.patch('backend.utils.stop_agent'),
             'stop_builtin_server': mock.patch(
                 'backend.utils.stop_builtin_server'),
             'stop_haproxy_apache': mock.patch(
@@ -271,7 +192,7 @@
         """Ensure the mocked write_gui_config has been properly called."""
         mocks.write_gui_config.assert_called_once_with(
             config['juju-gui-console-enabled'], config['login-help'],
-            config['read-only'], config['staging'], config['charmworld-url'],
+            config['read-only'], config['charmworld-url'],
             mocks.compute_build_dir(), secure=config['secure'],
             sandbox=config['sandbox'], ga_key=config['ga-key'],
             show_get_juju_button=config['show-get-juju-button'], password=None)
@@ -293,34 +214,14 @@
             test_backend.destroy()
         self.assertFalse(os.path.exists(utils.BASE_DIR), utils.BASE_DIR)
 
-    def test_install_python_legacy_stable(self):
-        # Install a pyJuju backend with legacy server and stable release.
-        config = self.make_config({'builtin-server': False})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.install()
-        mocks.install_missing_packages.assert_called_once_with(
-            set(EXPECTED_PYTHON_LEGACY_DEBS),
-            repository=self.repository_location)
-        mocks.fetch_api.assert_called_once_with(self.juju_api_branch)
-        mocks.parse_source.assert_called_once_with(self.juju_gui_source)
-        mocks.fetch_gui_release.assert_called_once_with(
-            *self.parse_source_return_value)
-        self.assertFalse(mocks.fetch_gui_from_branch.called)
-        mocks.setup_gui.assert_called_once_with(mocks.fetch_gui_release())
-        self.assertFalse(mocks.install_builtin_server.called)
-
     def test_install_go_legacy_stable(self):
         # Install a juju-core backend with legacy server and stable release.
         config = self.make_config({'builtin-server': False})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.install()
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.install()
         mocks.install_missing_packages.assert_called_once_with(
             set(EXPECTED_GO_LEGACY_DEBS), repository=self.repository_location)
-        self.assertFalse(mocks.fetch_api.called)
         mocks.parse_source.assert_called_once_with(self.juju_gui_source)
         mocks.fetch_gui_release.assert_called_once_with(
             *self.parse_source_return_value)
@@ -328,33 +229,14 @@
         mocks.setup_gui.assert_called_once_with(mocks.fetch_gui_release())
         self.assertFalse(mocks.install_builtin_server.called)
 
-    def test_install_python_builtin_stable(self):
-        # Install a pyJuju backend with builtin server and stable release.
-        config = self.make_config({'builtin-server': True})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.install()
-        mocks.install_missing_packages.assert_called_once_with(
-            set(EXPECTED_PYTHON_BUILTIN_DEBS), repository=None)
-        mocks.fetch_api.assert_called_once_with(self.juju_api_branch)
-        mocks.parse_source.assert_called_once_with(self.juju_gui_source)
-        mocks.fetch_gui_release.assert_called_once_with(
-            *self.parse_source_return_value)
-        self.assertFalse(mocks.fetch_gui_from_branch.called)
-        mocks.setup_gui.assert_called_once_with(mocks.fetch_gui_release())
-        mocks.install_builtin_server.assert_called_once_with()
-
     def test_install_go_builtin_stable(self):
         # Install a juju-core backend with builtin server and stable release.
         config = self.make_config({'builtin-server': True})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.install()
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.install()
         mocks.install_missing_packages.assert_called_once_with(
             set(EXPECTED_GO_BUILTIN_DEBS), repository=None)
-        self.assertFalse(mocks.fetch_api.called)
         mocks.parse_source.assert_called_once_with(self.juju_gui_source)
         mocks.fetch_gui_release.assert_called_once_with(
             *self.parse_source_return_value)
@@ -373,12 +255,10 @@
             ),
         ]
         config = self.make_config({'builtin-server': True})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.install()
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.install()
         mocks.install_missing_packages.assert_has_calls(expected_calls)
-        self.assertFalse(mocks.fetch_api.called)
         mocks.parse_source.assert_called_once_with(self.juju_gui_source)
         mocks.fetch_gui_from_branch.assert_called_once_with(
             'lp:juju-gui', 42, self.command_log_file)
@@ -386,31 +266,12 @@
         mocks.setup_gui.assert_called_once_with(mocks.fetch_gui_from_branch())
         mocks.install_builtin_server.assert_called_once_with()
 
-    def test_start_python_legacy(self):
-        # Start a pyJuju backend with legacy server.
-        config = self.make_config({'builtin-server': False})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.start()
-        mocks.start_agent.assert_called_once_with(self.ssl_cert_path)
-        mocks.compute_build_dir.assert_called_with(
-            config['juju-gui-debug'], config['serve-tests'])
-        self.assert_write_gui_config_called(mocks, config)
-        mocks.open_port.assert_has_calls([mock.call(80), mock.call(443)])
-        mocks.start_haproxy_apache.assert_called_once_with(
-            mocks.compute_build_dir(), config['serve-tests'],
-            self.ssl_cert_path, config['secure'])
-        self.assertFalse(mocks.start_builtin_server.called)
-
     def test_start_go_legacy(self):
         # Start a juju-core backend with legacy server.
         config = self.make_config({'builtin-server': False})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.start()
-        self.assertFalse(mocks.start_agent.called)
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.start()
         mocks.compute_build_dir.assert_called_with(
             config['juju-gui-debug'], config['serve-tests'])
         self.assert_write_gui_config_called(mocks, config)
@@ -420,33 +281,12 @@
             self.ssl_cert_path, config['secure'])
         self.assertFalse(mocks.start_builtin_server.called)
 
-    def test_start_python_builtin(self):
-        # Start a pyJuju backend with builtin server.
-        config = self.make_config({'builtin-server': True})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.start()
-        mocks.start_agent.assert_called_once_with(self.ssl_cert_path)
-        mocks.compute_build_dir.assert_called_with(
-            config['juju-gui-debug'], config['serve-tests'])
-        self.assert_write_gui_config_called(mocks, config)
-        mocks.open_port.assert_has_calls([mock.call(80), mock.call(443)])
-        mocks.start_builtin_server.assert_called_once_with(
-            mocks.compute_build_dir(), self.ssl_cert_path,
-            config['serve-tests'], config['sandbox'],
-            config['builtin-server-logging'], not config['secure'],
-            config['charmworld-url'])
-        self.assertFalse(mocks.start_haproxy_apache.called)
-
     def test_start_go_builtin(self):
         # Start a juju-core backend with builtin server.
         config = self.make_config({'builtin-server': True})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.start()
-        self.assertFalse(mocks.start_agent.called)
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.start()
         mocks.compute_build_dir.assert_called_with(
             config['juju-gui-debug'], config['serve-tests'])
         self.assert_write_gui_config_called(mocks, config)
@@ -458,47 +298,21 @@
             config['charmworld-url'])
         self.assertFalse(mocks.start_haproxy_apache.called)
 
-    def test_stop_python_legacy(self):
-        # Stop a pyJuju backend with legacy server.
-        config = self.make_config({'builtin-server': False})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.stop()
-        mocks.stop_agent.assert_called_once_with()
-        mocks.stop_haproxy_apache.assert_called_once_with()
-        self.assertFalse(mocks.stop_builtin_server.called)
-
     def test_stop_go_legacy(self):
         # Stop a juju-core backend with legacy server.
         config = self.make_config({'builtin-server': False})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.stop()
-        self.assertFalse(mocks.stop_agent.called)
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.stop()
         mocks.stop_haproxy_apache.assert_called_once_with()
         self.assertFalse(mocks.stop_builtin_server.called)
 
-    def test_stop_python_builtin(self):
-        # Stop a pyJuju backend with builtin server.
-        config = self.make_config({'builtin-server': True})
-        with simulate_pyjuju:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.stop()
-        mocks.stop_agent.assert_called_once_with()
-        mocks.stop_builtin_server.assert_called_once_with()
-        self.assertFalse(mocks.stop_haproxy_apache.called)
-
     def test_stop_go_builtin(self):
         # Stop a juju-core backend with builtin server.
         config = self.make_config({'builtin-server': True})
-        with simulate_juju_core:
-            test_backend = backend.Backend(config=config)
-            with self.mock_all() as mocks:
-                test_backend.stop()
-        self.assertFalse(mocks.stop_agent.called)
+        test_backend = backend.Backend(config=config)
+        with self.mock_all() as mocks:
+            test_backend.stop()
         mocks.stop_builtin_server.assert_called_once_with()
         self.assertFalse(mocks.stop_haproxy_apache.called)
 
@@ -508,22 +322,22 @@
     def test_same_config(self):
         test_backend = backend.Backend(
             config={
-                'sandbox': False, 'staging': False, 'builtin-server': False},
+                'sandbox': False, 'builtin-server': False},
             prev_config={
-                'sandbox': False, 'staging': False, 'builtin-server': False},
+                'sandbox': False, 'builtin-server': False},
         )
         self.assertFalse(test_backend.different('sandbox'))
-        self.assertFalse(test_backend.different('staging'))
+        self.assertFalse(test_backend.different('builtin-server'))
 
     def test_different_config(self):
         test_backend = backend.Backend(
             config={
-                'sandbox': False, 'staging': False, 'builtin-server': False},
+                'sandbox': False, 'builtin-server': False},
             prev_config={
-                'sandbox': True, 'staging': False, 'builtin-server': False},
+                'sandbox': True, 'builtin-server': False},
         )
         self.assertTrue(test_backend.different('sandbox'))
-        self.assertFalse(test_backend.different('staging'))
+        self.assertFalse(test_backend.different('builtin-server'))
 
 
 class TestCallMethods(unittest.TestCase):
 
=== modified file 'tests/test_helpers.py'
--- tests/test_helpers.py	2013-11-26 20:42:52 +0000
+++ tests/test_helpers.py	2014-01-15 14:49:45 +0000
@@ -20,7 +20,6 @@
 import json
 import os
 import shutil
-import subprocess
 import tempfile
 import unittest
 
@@ -34,11 +33,9 @@
     juju_destroy_service,
     juju_env,
     juju_status,
-    juju_version,
     ProcessError,
     retry,
     stop_services,
-    Version,
     wait_for_unit,
     WebSocketClient,
 )
@@ -203,74 +200,6 @@
         mock_juju.assert_called_once_with('status', '--format', 'json')
 
 
[e-mail]('subprocess.check_output')
-class TestJujuVersion(unittest.TestCase):
-
-    error = subprocess.CalledProcessError(2, 'invalid flag', 'output')
-
-    def test_pyjuju(self, mock_check_output):
-        # The pyJuju version is correctly retrieved.
-        mock_check_output.return_value = '0.7.2'
-        version = juju_version()
-        self.assertEqual(Version(0, 7, 2), version)
-        mock_check_output.assert_called_once_with(
-            ['juju', '--version'], stderr=subprocess.STDOUT,
-        )
-
-    def test_juju_core(self, mock_check_output):
-        # The juju-core version is correctly retrieved.
-        mock_check_output.side_effect = (self.error, '1.12.3')
-        version = juju_version()
-        self.assertEqual(Version(1, 12, 3), version)
-        self.assertEqual(2, mock_check_output.call_count)
-        first_call, second_call = mock_check_output.call_args_list
-        self.assertEqual(
-            mock.call(['juju', '--version'], stderr=subprocess.STDOUT),
-            first_call,
-        )
-        self.assertEqual(mock.call(['juju', 'version']), second_call)
-
-    def test_not_semantic_versioning(self, mock_check_output):
-        # If the patch number is missing, it is set to zero.
-        mock_check_output.return_value = '0.7'
-        version = juju_version()
-        self.assertEqual(Version(0, 7, 0), version)
-
-    def test_prefix(self, mock_check_output):
-        # The function handles versions returned as "juju x.y.z".
-        mock_check_output.return_value = 'juju 0.8.3'
-        version = juju_version()
-        self.assertEqual(Version(0, 8, 3), version)
-
-    def test_suffix(self, mock_check_output):
-        # The function handles versions returned as "x.y.z-series-arch".
-        mock_check_output.return_value = '1.10.3-raring-amd64'
-        version = juju_version()
-        self.assertEqual(Version(1, 10, 3), version)
-
-    def test_all(self, mock_check_output):
-        # Additional information is correctly handled.
-        mock_check_output.side_effect = (self.error, 'juju 1.234-precise-i386')
-        version = juju_version()
-        self.assertEqual(Version(1, 234, 0), version)
-        self.assertEqual(2, mock_check_output.call_count)
-
-    def test_invalid_version(self, mock_check_output):
-        # A ValueError is raised if the returned version is not valid.
-        mock_check_output.return_value = '42'
-        with self.assertRaises(ValueError) as info:
-            juju_version()
-        self.assertEqual("invalid juju version: '42'", str(info.exception))
-
-    def test_failure(self, mock_check_output):
-        # A CalledProcessError is raised if the Juju version cannot be found.
-        mock_check_output.side_effect = (self.error, self.error)
-        with self.assertRaises(subprocess.CalledProcessError) as info:
-            juju_version()
-        self.assertIs(self.error, info.exception)
-        self.assertEqual(2, mock_check_output.call_count)
-
-
 class TestProcessError(unittest.TestCase):
 
     def test_str(self):
 
=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2014-01-09 21:48:27 +0000
+++ tests/test_utils.py	2014-01-15 14:49:45 +0000
@@ -23,15 +23,14 @@
 from subprocess import CalledProcessError
 import tempfile
 import unittest
+import yaml
 
 import charmhelpers
 import mock
 from shelltoolbox import environ
 import tempita
-import yaml
 
 from utils import (
-    API_PORT,
     JUJU_GUI_DIR,
     JUJU_PEM,
     WEB_PORT,
@@ -45,10 +44,8 @@
     get_launchpad_release,
     get_npm_cache_archive_url,
     get_release_file_path,
-    get_zookeeper_address,
     install_builtin_server,
     install_missing_packages,
-    legacy_juju,
     log_hook,
     parse_source,
     remove_apache_setup,
@@ -57,14 +54,10 @@
     save_or_create_certificates,
     setup_apache_config,
     setup_haproxy_config,
-    start_agent,
     start_builtin_server,
     start_haproxy_apache,
-    start_improv,
-    stop_agent,
     stop_builtin_server,
     stop_haproxy_apache,
-    stop_improv,
     write_builtin_server_startup,
     write_gui_config,
 )
@@ -410,30 +403,6 @@
         self.assertIsNone(path)
 
 
-class TestLegacyJuju(unittest.TestCase):
-
-    def setUp(self):
-        self.base_dir = tempfile.mkdtemp()
-        self.addCleanup(shutil.rmtree, self.base_dir)
-        # Monkey patch utils.CURRENT_DIR.
-        self.original_current_dir = utils.CURRENT_DIR
-        utils.CURRENT_DIR = tempfile.mkdtemp(dir=self.base_dir)
-
-    def tearDown(self):
-        # Restore the original utils.CURRENT_DIR.
-        utils.CURRENT_DIR = self.original_current_dir
-
-    def test_jujucore(self):
-        # If the agent file is found this is a juju-core environment.
-        agent_path = os.path.join(self.base_dir, 'agent.conf')
-        open(agent_path, 'w').close()
-        self.assertFalse(legacy_juju())
-
-    def test_pyjuju(self):
-        # If the agent file does not exist this is a PyJuju environment.
-        self.assertTrue(legacy_juju())
-
-
 def make_collection(attr, values):
     """Create a collection of objects having an attribute named *attr*.
 
@@ -632,22 +601,6 @@
         self.assertEqual('0.1.0.xz', name)
 
 
-class TestGetZookeeperAddress(unittest.TestCase):
-
-    def setUp(self):
-        self.zookeeper_address = 'example.com:2000'
-        contents = 'env JUJU_ZOOKEEPER="{}"\n'.format(self.zookeeper_address)
-        with tempfile.NamedTemporaryFile(delete=False) as agent_file:
-            agent_file.write(contents)
-            self.agent_file_path = agent_file.name
-        self.addCleanup(os.remove, self.agent_file_path)
-
-    def test_get_zookeeper_address(self):
-        # Ensure the Zookeeper address is correctly retreived.
-        address = get_zookeeper_address(self.agent_file_path)
-        self.assertEqual(self.zookeeper_address, address)
-
-
 class TestLogHook(unittest.TestCase):
 
     def setUp(self):
@@ -853,9 +806,6 @@
         def su(user):
             yield None
 
-        def get_zookeeper_address_mock(fp):
-            return self.fake_zk_address
-
         self.files = {}
         orig_rtf = utils.render_to_file
 
@@ -872,8 +822,6 @@
             run=(utils.run, run),
             unit_get=(utils.unit_get, noop),
             render_to_file=(utils.render_to_file, render_to_file),
-            get_zookeeper_address=(
-                utils.get_zookeeper_address, get_zookeeper_address_mock),
             get_api_address=(utils.get_api_address, noop),
             APACHE_PORTS=(utils.APACHE_PORTS, 'PORTS_NOT_THERE'),
             APACHE_SITE=(utils.APACHE_SITE, 'SITE_NOT_THERE'),
@@ -891,39 +839,6 @@
             setattr(utils, fn, fcns[0])
         shutil.copy = self.shutil_copy
 
-    def test_start_improv(self):
-        staging_env = 'large'
-        start_improv(staging_env, self.ssl_cert_path,)
-        conf = self.files['juju-api-improv.conf']
-        self.assertTrue('--port %s' % API_PORT in conf)
-        self.assertTrue(staging_env + '.json' in conf)
-        self.assertTrue(self.ssl_cert_path in conf)
-        self.assertEqual(self.svc_ctl_call_count, 1)
-        self.assertEqual(self.service_names, ['juju-api-improv'])
-        self.assertEqual(self.actions, [charmhelpers.START])
-
-    def test_stop_improv(self):
-        stop_improv()
-        self.assertEqual(self.svc_ctl_call_count, 1)
-        self.assertEqual(self.service_names, ['juju-api-improv'])
-        self.assertEqual(self.actions, [charmhelpers.STOP])
-
-    def test_start_agent(self):
-        start_agent(self.ssl_cert_path, 'config')
-        conf = self.files['juju-api-agent.conf']
-        self.assertTrue('--port %s' % API_PORT in conf)
-        self.assertTrue('JUJU_ZOOKEEPER=%s' % self.fake_zk_address in conf)
-        self.assertTrue(self.ssl_cert_path in conf)
-        self.assertEqual(self.svc_ctl_call_count, 1)
-        self.assertEqual(self.service_names, ['juju-api-agent'])
-        self.assertEqual(self.actions, [charmhelpers.START])
-
-    def test_stop_agent(self):
-        stop_agent()
-        self.assertEqual(self.svc_ctl_call_count, 1)
-        self.assertEqual(self.service_names, ['juju-api-agent'])
-        self.assertEqual(self.actions, [charmhelpers.STOP])
-
     def test_compute_build_dir(self):
         for (juju_gui_debug, serve_tests, result) in (
             (False, False, 'build-prod'),
@@ -941,9 +856,7 @@
         haproxy_conf = self.files['haproxy.cfg']
         self.assertIn('ca-base {}'.format(self.ssl_cert_path), haproxy_conf)
         self.assertIn('crt-base {}'.format(self.ssl_cert_path), haproxy_conf)
-        self.assertIn('ws1 127.0.0.1:{}'.format(API_PORT), haproxy_conf)
         self.assertIn('web1 127.0.0.1:{}'.format(WEB_PORT), haproxy_conf)
-        self.assertIn('ca-file {}'.format(JUJU_PEM), haproxy_conf)
         self.assertIn('crt {}'.format(JUJU_PEM), haproxy_conf)
         self.assertIn('redirect scheme https', haproxy_conf)
 
@@ -988,8 +901,9 @@
         guiserver_conf = self.files['guiserver.conf']
         self.assertIn('description "GUIServer"', guiserver_conf)
         self.assertIn('--logging="info"', guiserver_conf)
-        self.assertIn('--apiurl="wss://127.0.0.1:8080/ws"', guiserver_conf)
-        self.assertIn('--apiversion="python"', guiserver_conf)
+        # The get_api_address is noop'd in these tests so the addr is None.
+        self.assertIn('--apiurl="wss://None"', guiserver_conf)
+        self.assertIn('--apiversion="go"', guiserver_conf)
         self.assertIn(
             '--testsroot="{}/test/"'.format(JUJU_GUI_DIR), guiserver_conf)
         self.assertIn('--insecure', guiserver_conf)
@@ -1029,13 +943,13 @@
 
     def test_write_gui_config(self):
         write_gui_config(
-            False, 'This is login help.', True, True, self.charmworld_url,
+            False, 'This is login help.', True, self.charmworld_url,
             self.build_dir, config_js_path='config',
             ga_key='UA-123456')
         js_conf = self.files['config']
         self.assertIn('consoleEnabled: false', js_conf)
-        self.assertIn('user: "admin"', js_conf)
-        self.assertIn('password: "admin"', js_conf)
+        self.assertIn('user: "user-admin"', js_conf)
+        self.assertIn('password: null', js_conf)
         self.assertIn('login_help: "This is login help."', js_conf)
         self.assertIn('readOnly: true', js_conf)
         self.assertIn("socket_url: 'wss://", js_conf)
@@ -1046,38 +960,22 @@
 
     def test_write_gui_config_insecure(self):
         write_gui_config(
-            False, 'This is login help.', True, True, self.charmworld_url,
+            False, 'This is login help.', True, self.charmworld_url,
             self.build_dir, secure=False, config_js_path='config')
         js_conf = self.files['config']
         self.assertIn("socket_url: 'ws://", js_conf)
         self.assertIn('socket_protocol: "ws"', js_conf)
 
-    @mock.patch('utils.legacy_juju')
-    def test_write_gui_config_default_python_password(self, mock_legacy_juju):
-        mock_legacy_juju.return_value = True
-        write_gui_config(
-            False, 'This is login help.', True, True, self.charmworld_url,
-            self.build_dir, config_js_path='config',
-            password='kumquat')
-        js_conf = self.files['config']
-        self.assertIn('user: "admin"', js_conf)
-        self.assertIn('password: "kumquat"', js_conf)
-
-    @mock.patch('utils.legacy_juju')
-    def test_write_gui_config_default_sandbox_backend(self, mock_legacy_juju):
-        mock_legacy_juju.return_value = True
-        write_gui_config(
-            False, 'This is login help.', True, True, self.charmworld_url,
+    def test_write_gui_config_default_sandbox_backend(self):
+        write_gui_config(
+            False, 'This is login help.', True, self.charmworld_url,
             self.build_dir, config_js_path='config',
             password='kumquat', sandbox=True)
         js_conf = self.files['config']
-        # Because this is sandbox, the apiBackend is always go, even though it
-        # is legacy_juju.
+        # Because this is sandbox, the apiBackend is always go.
         self.assertIn('apiBackend: "go"', js_conf)
 
-    @mock.patch('utils.legacy_juju')
-    def test_write_gui_config_default_go_password(self, mock_legacy_juju):
-        mock_legacy_juju.return_value = False
+    def test_write_gui_config_default_go_password(self):
         write_gui_config(
             False, 'This is login help.', True, True, self.charmworld_url,
             self.build_dir, config_js_path='config',
@@ -1097,7 +995,7 @@
             self.build_dir, sandbox=True, config_js_path='config')
         js_conf = self.files['config']
         self.assertIn('sandbox: true', js_conf)
-        self.assertIn('user: "admin"', js_conf)
+        self.assertIn('user: "user-admin"', js_conf)
         self.assertIn('password: "admin"', js_conf)
 
     def test_write_gui_config_with_button(self):