juju-ci-tools

Merge lp://staging/~sinzui/juju-ci-tools/controller-model into lp://staging/juju-ci-tools

  1. controller-model
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 1428
Proposed branch: lp://staging/~sinzui/juju-ci-tools/controller-model
Merge into: lp://staging/juju-ci-tools
Diff against target: 266 lines (+85/-18)
3 files modified
jujupy.py (+17/-4)
tests/test_deploy_stack.py (+2/-2)
tests/test_jujupy.py (+66/-12)
To merge this branch: bzr merge lp://staging/~sinzui/juju-ci-tools/controller-model
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+295657@code.staging.launchpad.net

Description of the change

Rename 'admin' model to 'controller', preserve old name in EnvJujuClient2B7.

The Juju team are ready to rename the 'admin' model to 'controller' model. These changes supports their branch. The get_admin_model_name() returns 'controller'. The original method is moved to the new EnvJujuClient2B7. The factory function will use the EnvJujuClient2B7 for 2.0-beta7.

Several ClientTest test methods were updated. Four were adapted to run in TestEnvJujuClient2B7. The FakeControllerState was updated to use controller. A few logging tests were also updated.

Thee are some lint spacing issues also fixed.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

Looks good. Should we also be updating our API to reflect the name change, e.g. get_controller_model_name? That's "clean-as-you-go", I think.

Also, I think landing this will break testing of beta8 until the corresponding juju change is landed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches