Tweak loading of remore apps and remote relations #6613

Merged
merged 2 commits into from Nov 25, 2016

Conversation

Projects
None yet
3 participants
Owner

wallyworld commented Nov 25, 2016

When loading remote relations in the worker, we no longer export the relations as a side effect of the api call. This will be done separately downstream when the relations details are published.

Also add name and status to remote application struct.

axw approved these changes Nov 25, 2016

LGTM with RemoteRelations -> Relations

apiserver/remoterelations/mock_test.go
@@ -225,6 +227,11 @@ func (r *mockRemoteApplication) Life() state.Life {
return r.life
}
+func (r *mockRemoteApplication) Status() (status.StatusInfo, error) {
+ r.MethodCall(r, "Life")
@axw

axw Nov 25, 2016

Member

s/Life/Status/

Owner

wallyworld commented Nov 25, 2016

$$merge$$

Contributor

jujubot commented Nov 25, 2016

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

@jujubot jujubot merged commit 1f6bf75 into juju:develop Nov 25, 2016

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