Merge cross model relations feature branch #6473
Merged
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
… ServiceEntity interface
Offer command. Initial cross model relations offer cli, api and apiserver placeholder. For now, until state is done, apiserver holds needed info in-memory. (Review request: http://reviews.vapour.ws/r/3038/)
[WIP] Add initial state model for remote services Define the state model and associated methods for remote services. There are methods to allow local services to be related to remote services. The relevant relation infrastructure has been adapted to support report services, including deleting the remote service entry when the last relation has been removed. We also add an IsRemote flag to Endpoint to record if the endpoint is from a remote service or not. (Review request: http://reviews.vapour.ws/r/3022/)
Add state model for service directory Add state model for a remote service directory. This is used to store offered endpoints for environments within the host controller. (Review request: http://reviews.vapour.ws/r/3046/)
Add remote service info to status Modify juju status so that it displays remote service information. yaml, tabular, summary formats are updated (Review request: http://reviews.vapour.ws/r/3447/)
Add find-endpoints command Two major changes: 1. juju find-endpoints which allows the user to see what services have been offered Includes: - CLI command - api and apiserver components - feature tests TODO - we still don't filter on endpoint name or interface 2. fix issues with juju show-endpoint command - description column too narrow - words in description were omitted (Review request: http://reviews.vapour.ws/r/3446/)
Cross-model relations: merge master (Review request: http://reviews.vapour.ws/r/3454/)
Merge develop branch Merge develop branch in preparation for merging feature branch back into develop.
Add cross-model feature flag to hide cross model relations functionality until it is ready. This includes CLI, API facades, and database collections.
Add back Application facade v2
Merge latest develop branch
Merge latest develop branch
Add cross-model feature flag checks to more places to avoid trying to invoke missing functionality when the flag is not set.
mjs
approved these changes
Oct 20, 2016
Fix issue when merging develop branch
Fix develop merge issue
|
|
|
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.
This PR merges the cross model relations feature branch. The vast majority of the work has been reviewed previously for landing into the feature branch.
The main commit to look at is:
dbf2140
The above commit adds the cross model feature flag to hide the cross model relations features - CLI, facades, and database collections.
As a side effect, the work in the feature branch also fixes:
https://bugs.launchpad.net/juju/+bug/1621754
QA:
bootstrap and use a 2.0.0 GA client to deploy and relate services
bootstrap and ensure cross model stuff works with feature flag