Capability detection for networker #626
Closed
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
added 17 commits
August 15, 2014 17:57
…r). Tests are missing.
…-detection-for-networker
…-detection-for-networker
…-detection-for-networker
* master: (23 commits)
Added tests for the help output.
Using the setDoc for the command documentation.
need to check for an error here
added sent field to NewMetric factory
worker/upgrader: use already downloaded tools if available
rsyslog: updated documentation, simplified logrotate file rendering.
rsyslog: comments for exported functions
rsyslog: only render templates once, improve file check test
rsyslog: check for logrotate files, updated comments
rsyslog: logrotate tests
rsyslog: logrotate comments and docs
rsyslog: add logrotate for all-machines.log
provider/maas: report arch matching tools in tests
Update deps for utils package update
Add extra logging
corresponding changes to worker/
Initial merge of 1.20 into master
state/api/{keyupdater,networker}: use names.Tag
unique strings for makemetrics
added newmetrics function to testing factory
...
…-detection-for-networker
… API/parameter model.
…-detection-for-networker
…-detection-for-networker
…-detection-for-networker
…resSafeNetworker environment capacity.
…-detection-for-networker
| @@ -310,6 +311,20 @@ func openAPIState(agentConfig agent.Config, a Agent) (_ *api.State, _ *apiagent. | |||
| return st, entity, nil | |||
| } | |||
|
|
|||
| // environCapability returns the capability of the environment | |||
| return mig.id | ||
| } | ||
|
|
||
| // IsManual returns the manually provisioning flag of the simulated machine. |
There was a problem hiding this comment.
s/the manually provisioning flag.*$/whether the simulated machine was manually provisioned.
|
A few more suggestions, it looks almost ready! Thanks! |
added 2 commits
September 5, 2014 18:06
* master: Remove AddAdminUser and create the user when the environment is created. Fix tests Merge pull request #696 from wallyworld/keep-broken-part-2 Remove DisplayName option Update names dependency. Remove the user checking for the keymanager. move the tests inline use lumberjack for log rolling juju/testing: don't remove admin user in JujuConnSuite Added comment Remove unneeded removes Add API func ShareEnvironment to client and server API:
| bootstrapInstanceId instance.Id = "localhost" | ||
|
|
||
| // bootstrapMachineId is the id of the bootstrap machine and | ||
| // used to check if a safe networker is required. |
There was a problem hiding this comment.
Please, rephrase like this:
// bootstrapMachineId is the id of the bootstrap machine.
|
LGTM with the suggested minor changes: tech dept bug + TODO comment about making dummy provider's RequireSafeNetworker capability configurable in tests; renaming NewMachinerAPI to NewMachinerAPIV1 and leaving the older constructor named NewMachineAPIV0; fixing the suggested doc comments and other trivials. |
|
Ah, last but not least - rename this PR to remove the WIP prefix please. |
themue
changed the title
added 2 commits
September 8, 2014 17:39
…-detection-for-networker
| // API v1 or higher, machines 0 and 1. | ||
| false, true, true, true, | ||
| false, true, true, true, | ||
| // API v0, machines 0 and 1. |
| Tags []string | ||
| } | ||
|
|
||
| // GetMachinesResultsV0 holds the results of a MachinerAPIV1.GetMachines call. |
There was a problem hiding this comment.
typ0, should be: GetMachinesResultsV1.
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.
In a first approach the decision on using the standard or the safe networker has been done based on the provider type. In case of all but MAAS the safe networker has been used. Now a new environment capability has been added, so that each provider can return if it requires a safe networker for the current machine. As this today depends on the machine (local provider dislikes the changes done by the networker on the bootstap node, because it's the host system) and if the machine has been manually provisioned.
Fixes #1354365.