New API call, Controller.HostedModelConfig #6315
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
|
Needs QA steps. In particular, have you tested an rc1 client with an rc2 server and vice versa? |
mjs
reviewed
Sep 26, 2016
| return api.MakeCloudSpec(result.Result) | ||
| } | ||
|
|
||
| func (api *CloudSpecAPI) MakeCloudSpec(pSpec *params.CloudSpec) (environs.CloudSpec, error) { |
| // HostedModelConfig returns all the information that the client needs | ||
| // in order to connect directly with the host model's provider and destroy | ||
| // it directly. | ||
| func (s *ControllerAPI) HostedModelConfig() (params.HostedModelConfigResults, error) { |
There was a problem hiding this comment.
This confused me a bit at first. The name made me think it would return the config for one hosted model, but it doesn't take any args. How about calling it HostedModelConfigs?
| @@ -22,6 +22,24 @@ type ModelConfigResults struct { | |||
| Config map[string]ConfigValue `json:"config"` | |||
| } | |||
|
|
|||
| // HostedModelConfig contains the model config and the cloud spec | |||
| // for the model, both things that the CLI needs to talk directly | |||
howbazaar
commented
Sep 26, 2016
| // HostedModelConfig returns all the information that the client needs | ||
| // in order to connect directly with the host model's provider and destroy | ||
| // it directly. | ||
| func (s *ControllerAPI) HostedModelConfig() (params.HostedModelConfigResults, error) { |
| @@ -22,6 +22,24 @@ type ModelConfigResults struct { | |||
| Config map[string]ConfigValue `json:"config"` | |||
| } | |||
|
|
|||
| // HostedModelConfig contains the model config and the cloud spec | |||
| // for the model, both things that the CLI needs to talk directly | |||
| return api.MakeCloudSpec(result.Result) | ||
| } | ||
|
|
||
| func (api *CloudSpecAPI) MakeCloudSpec(pSpec *params.CloudSpec) (environs.CloudSpec, error) { |
mjs
approved these changes
Sep 26, 2016
|
|
|
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 new API call is used in an upcoming PR that adds a timeout to the kill-controller command. Once the timeout is hit, the client will attempt to destroy all the models by talking to the provider directly. To do this, it needs to have the model's config and cloud config in order to be able to instantiate an Environ.
The facade version is not bumped as it is no danger to the client. If the client is newer than the server, which is possible for early RCs, then a timeout of 5 minutes will happen before the provider is invoked directly. The call will fail with NotImplemented, so will cause no further damage. kill-controller was written with the ability to call it more than once, so running the command again is expected behaviour.