Merge lp://staging/~abentley/juju-ci-tools/fix-named-manual into lp://staging/juju-ci-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1849
Proposed branch: lp://staging/~abentley/juju-ci-tools/fix-named-manual
Merge into: lp://staging/juju-ci-tools
Diff against target: 231 lines (+167/-8)
2 files modified
jujupy/client.py (+65/-8)
jujupy/tests/test_client.py (+102/-0)
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/fix-named-manual
Reviewer Review Type Date Requested Status
Seman (community) Approve
Curtis Hovey (community) code Approve
Review via email: mp+315161@code.staging.launchpad.net

Commit message

Fix bug #1650302: assess_cloud supplies invalid region.

Description of the change

Fix bug #1650302: assess_cloud supplies invalid region.

It's not spelled out very clearly, but juju's commandline has two modes:
cloud/region
provider/endpoint

The latter is supported for lxd and manual providers; their configuration needs are so trivial that a clouds.yaml entry can be overkill.

Manual, and possibly LXD, can still be used in clouds.yaml, and that is the source of bug #1650302. We failed to distinguish between provider type and cloud name, leading us to emit "cloud/endpoint", which is not permitted.

This branch adds that distinction. It clarifies that "endpoint" rather than "region" will be updated if the commandline cloud is a provider.

To post a comment you must log in.
Revision history for this message
Seman (sseman) wrote :

I have few questions. See in-line.

review: Needs Information
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)
Revision history for this message
Aaron Bentley (abentley) wrote :

Replies inline.

Revision history for this message
Seman (sseman) wrote :

Thanks for the clarification.

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