Remove direct model cmr #7097
Merged
Remove direct model cmr #7097
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
axw
approved these changes
Mar 14, 2017
apiserver/application/application.go
Outdated
| } | ||
|
|
||
| var st *state.State | ||
| fail := func(err error) ( |
There was a problem hiding this comment.
move this to the top of the method, and use it everywhere?
apiserver/application/application.go
Outdated
| } | ||
| // Get the backend state for the source model so we can lookup the application. | ||
| st, err := api.backend.ForModel(sourceModelTag) | ||
| st, err = api.backend.ForModel(sourceModelTag) |
There was a problem hiding this comment.
shouldn't we be using the StatePool provided to apiserver facades?
There was a problem hiding this comment.
yes we should, was old code that i missed
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Tests failed |
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
Please see the first commit.
The second commit is a drive by rename of service->application in the test suite.
We remove the ability to relate to other applications without first having that application offered in the remote model. Essentially we add a juju offer step to the workflow.
The work is essentially refactoring existing code and removing some now obsolete methods.
Note: there's still work required to fix the URL format and until that is done, juju offer is clumsy and requires a full URL to be specified even though it's not used.
QA steps
juju bootstrap
juju deploy mysql
juju offer mysql:db local:/u/me/hosted-mysql
juju switch controller
juju deploy mediawiki
juju relate mediawiki:db default.hosted-mysql