/juju

Merge cross model relations feature branch #6473

Merged
merged 227 commits into from Oct 20, 2016

Conversation

Reviewers

@mjs mjs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@wallyworld @jujubot @mjs @anastasiamac @axw
@wallyworld
Owner

wallyworld commented Oct 19, 2016

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

wallyworld and others added some commits Oct 29, 2015

@wallyworld
Add initial state model for remote services
ecf8de4
@wallyworld
Rework implementation to remote IsRemote from endpoints and introduce… 
… ServiceEntity interface
3a86c32
@anastasiamac
Initial cross model relations offer cli, api and apiserver placeholder.
6d13d9b
@anastasiamac
Comment corrections.
9bf3af7
@anastasiamac
Tags from cli and serices layer validation.
47be45b
@anastasiamac
Bulk call and facade renaming.
a4ec287
@anastasiamac
Bulk call and service layer.
2d820d9
@anastasiamac
Swapped remote: for vendor:
a6f45e4
@anastasiamac
Rephrased.
036d7d0
@anastasiamac
User common not valid error \o/
954779e
@anastasiamac
Use existing error results.
1e2f61e
@anastasiamac
URL comments correction.
63fa96c
@jujubot
Merge pull request #3635 from anastasiamac/x-model-offer 
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/)
5766d98
@wallyworld
Improve implementation
6e287bc
@wallyworld
Tweak find service
63c0967
@wallyworld
Fix test
98ce539
@jujubot
Merge pull request #3618 from wallyworld/remote-service-state 
[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/)
a0805f7
@wallyworld
Add state model for service directory
b2c7aa7
@wallyworld
Some refactoring
52089c5
@wallyworld
Add description to service directory records
251be9b
@wallyworld
Add service directory facade and associated stubs
27721c2
@wallyworld
Refactor to a more PODO approach and move crossmodel to a model direc… 
…tory
b8d2d57
@wallyworld
Rename service directory to service offer
88383b2
@wallyworld
Cleanup
9cbc478
@wallyworld
Cleanup
ed243b7
@wallyworld
Fix tests
6249803
@axw
state: add remote services to allwatcher
2350df9
@jujubot
Merge pull request #3643 from wallyworld/service-directory-state 
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/)
dd045de
@wallyworld
Update from service-directory-state branch and resolve conflicts
4728e0c
@wallyworld
Merge upstream
709a8d3
@wallyworld
Cleanup and fixes to data model; incorporate upstream changes
96d3af6
@wallyworld
Code review tweaks
fff0bd5
@wallyworld
Fix wording
7171421
@jujubot
Merge pull request #3714 from axw/allwatcher-remote-service 
state: add remote services to allwatcher
954089e
@wallyworld
Fix tests
93d7425
@jujubot
Merge pull request #3699 from wallyworld/service-directory-facade 
Add service directory facade and associated stubs

We add an api facade to provide service directory functionality which will be hosted by a controller.
Also provide parsing for service URLs.

There are todos for the back end state functionality. These will be added in a subsequent branch. Feature tests will also be added later.

A ServiceDirectory interface is used to define the capability of the directory - this will allow a https based implementation to be added later.

(Review request: http://reviews.vapour.ws/r/3104/)
9cd8e6e
@wallyworld
Add service URL factory and wire up service directory facade to state
f612142
@wallyworld
Rework service directory facade - rename to ServiceOffers. Move direc… 
…tory selection to apiserver layer
c03a729
@wallyworld
Rename some APIs
2a02420
@wallyworld
Code review fixes
775aaac
@wallyworld
Rename url.scheme to url.directory
d0307e3
@jujubot
Merge pull request #3725 from wallyworld/wireup-service-directory 
Add service URL factory and wire up service directory facade to state

We remove some obsolete code and wire up the service directory facade on the apiserver side to state.

We also add a factory that takes a service url and returns the correct facade to use to process the URL. Only local: current supported.

(Review request: http://reviews.vapour.ws/r/3131/)
b0ff0cb
@wallyworld
Add state model for service offers
abdea7c
@anastasiamac
show-saas cli
79c6257
@anastasiamac
show-endpoints cli
caf2ee2
@anastasiamac
Sorted endpoint tuple stuff, added service interface and placeholder … 
…stub.
9aec209
@anastasiamac
Removed non-feature test...
1cad6bb
@anastasiamac
Sorted endpoint tuple stuff, added service interface and placeholder … 
…stub.
320f1c4
@anastasiamac
removed whitespace.
37311e5
@anastasiamac
Added truncation for long desc.
35079e5
@anastasiamac
Added todos
76a87eb
@anastasiamac
doc string
36fd360
@anastasiamac
Package protect internal methods.
b7bce01
@anastasiamac
Renamed column to ENDPOINT.
12aaec0
@anastasiamac
Wrap description in tabular format in addition to truncating.
5845994
@anastasiamac
Added more realistic test data for clarity.
cf2c1aa
@anastasiamac
Bulk apiserver.
5e6bd3d
@anastasiamac
Changed output to map style.
f4f85ad
@anastasiamac
Variable rename.
1d22226
@anastasiamac
Clarified error message.
25ec431

jujubot and others added some commits Dec 16, 2015

@jujubot
Merge pull request #3969 from wallyworld/merge-master-1612 
Merge master 1612

Merge master

(Review request: http://reviews.vapour.ws/r/3391/)
7a3dea4
@wallyworld
Support add-relation for remote services
d8d42dd
@wallyworld
Ensure service client facade has a Close()
8747557
@wallyworld
Typo
f38117d
@wallyworld
Fix test
14caa48
@jujubot
Merge pull request #3973 from wallyworld/support-add-relation 
Support add-relation for remote services

Make add-relation work for remote services.

We move the AddRelation and DestroyRelation api calls off the client facade and onto the service facade. Most of this PR relates to moving code and tests; all the large chunks of red and green. The tests moved from apiserver/client needed tweaking to make them work in apiserver/service.

The add-relation command is modified to use the service facade which has been bumped to version 2. Client facade shims are retained to support the GUI.

(Review request: http://reviews.vapour.ws/r/3395/)
1d4a7c9
@wallyworld
Finish adding support for relating to remote services
7452e22
@wallyworld
Rework api factory usage
d508d5c
@wallyworld
Add option to alias name of offered service
1e26915
@wallyworld
Revert alias till later
6832cb1
@wallyworld
Fiix tests
6b535fa
@jujubot
Merge pull request #3985 from wallyworld/support-add-relation-2 
Support add relation - part 2

Add more back end code to allow remote relations to be added.

(Review request: http://reviews.vapour.ws/r/3407/)
01168a0
@wallyworld
Relations come at end of delta slice
5a32798
@wallyworld
Add test
ad2be57
@wallyworld
Import order
20739da
@wallyworld
Merge master
d05a6c5
@jujubot
Merge pull request #4021 from wallyworld/merge-master-2212 
Merge master

Merge master

(Review request: http://reviews.vapour.ws/r/3440/)
04243a5
@jujubot
Merge pull request #4019 from wallyworld/delta-order-relations-last 
Delta order relations last

Ensure slice of deltas has relations last in the list.

(Review request: http://reviews.vapour.ws/r/3438/)
b827f7e
@wallyworld
USe system env for local service directory
eb7a1e6
@wallyworld
Delete logging
98b641b
@jujubot
Merge pull request #4022 from wallyworld/service-directory-system-env 
Use system env for local service directory

API calls to list offers from service directory use correct env now.

(Review request: http://reviews.vapour.ws/r/3441/)
f181c7e
@wallyworld
Add find-endpoints command, fix show command
9bcb22b
@wallyworld
go fmt
5247fd8
@wallyworld
Add remote service info to status
117236c
@wallyworld
Introduce new ServiceURLParts alias
23babf2
@wallyworld
Code review fixes
9793518
@wallyworld
Code review fixes
24e6132
@wallyworld
Fix error
51e3286
@wallyworld
Fix tests
a848514
@wallyworld
Improve test robustness
3a524ce
@jujubot
Merge pull request #4028 from wallyworld/remote-service-status 
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/)
24449cd
@jujubot
Merge pull request #4027 from wallyworld/find-endpoints-command 
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/)
fbafea7
@axw
Merge branch 'master' into cmr-merge-master
97db17d
@jujubot
Merge pull request #4035 from axw/cmr-merge-master 
Cross-model relations: merge master



(Review request: http://reviews.vapour.ws/r/3454/)
5a5052f
@wallyworld
Merge develop branch
8c5fe96
@jujubot
Merge pull request #6466 from wallyworld/merge-develop-1410 
Merge develop branch

Merge develop branch in preparation for merging feature branch back into develop.
2c2d7aa
@wallyworld
Add cross-model feature flag
7ef5e75
@wallyworld
Merge pull request #6470 from wallyworld/cross-model-feature-flag 
Add cross-model feature flag to hide cross model relations functionality until it is ready. This includes CLI, API facades, and database collections.
dbf2140
@wallyworld
Add back Application facade v2
7ce8681
@wallyworld
Merge pull request #6471 from wallyworld/restore-application-v2 
Add back Application facade v2
744b2a4
@wallyworld
Merge develop
8cdb127
@wallyworld
Merge pull request #6472 from wallyworld/merge-develop-1810 
Merge latest develop branch
70abdba
@mjs
Contributor

mjs commented on apiserver/application/application.go in dbf2140 Oct 19, 2016

in the wrong place
Owner

wallyworld replied Oct 19, 2016

fixed here and elsewhere
@mjs
Contributor

mjs commented on cmd/juju/application/addrelation.go in dbf2140 Oct 19, 2016

The documentation for the non-feature flag case appears to be lost
Owner

wallyworld replied Oct 19, 2016

There never was any doc for the non feature flag case. Just a single line of text for Purpose.

wallyworld added some commits Oct 19, 2016

@wallyworld
Merge pull request #6472 from wallyworld/merge-develop-1810 
Merge latest develop branch
cbbc295
@wallyworld
Add extra cross-model feature flag checks
7a420a6
@wallyworld
Merge pull request #6478 from wallyworld/more-crossmodel-featureflag 
Add cross-model feature flag checks to more places to avoid trying to invoke missing functionality when the flag is not set.
c211c22
@mjs

mjs approved these changes Oct 20, 2016
View changes

@wallyworld
Owner

wallyworld commented Oct 20, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Oct 20, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju
@jujubot
Contributor

jujubot commented Oct 20, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/9536
@wallyworld
Owner

wallyworld commented Oct 20, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Oct 20, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 6bb1eb5 into develop Oct 20, 2016
1 check passed

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy.
Details

@sinzui sinzui deleted the cross-model-relations branch Nov 15, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment