Merge lp:~wallyworld/juju-core/agent-conf-upgradedto into lp:~go-bot/juju-core/trunk
- agent-conf-upgradedto
- Merge into trunk
Proposed by
Ian Booth
| Status: | Merged |
|---|---|
| Approved by: | Ian Booth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2359 |
| Proposed branch: | lp:~wallyworld/juju-core/agent-conf-upgradedto |
| Merge into: | lp:~go-bot/juju-core/trunk |
| Diff against target: |
948 lines (+338/-206) 14 files modified
agent/agent.go (+71/-41) agent/agent_test.go (+122/-78) agent/bootstrap_test.go (+12/-10) agent/format-1.12_whitebox_test.go (+3/-0) agent/format-1.16.go (+35/-18) agent/format-1.16_whitebox_test.go (+25/-1) agent/format_whitebox_test.go (+8/-6) cmd/jujud/agent_test.go (+16/-14) cmd/jujud/bootstrap_test.go (+9/-7) environs/cloudinit/cloudinit.go (+10/-8) juju/testing/conn.go (+8/-7) worker/deployer/simple.go (+5/-4) worker/provisioner/kvm-broker_test.go (+7/-6) worker/provisioner/lxc-broker_test.go (+7/-6) |
| To merge this branch: | bzr merge lp:~wallyworld/juju-core/agent-conf-upgradedto |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Record upgradedToVersion in agent conf
The agent config files now record the version for
which upgrade steps were run. If there is no entry
in a config file, is is assumed the version is 1.16.
So there is no need for any migration, nor are there
compatibility issues. When 1.18 is deployed, the upgrade
steps are run and the config file will have 1.18 written
to it, allowing 1.20 to know that it is upgrding from
1.18 etc.
Description of the change
Record upgradedToVersion in agent conf
The agent config files now record the version for
which upgrade steps were run. If there is no entry
in a config file, is is assumed the version is 1.16.
So there is no need for any migration, nor are there
compatibility issues. When 1.18 is deployed, the upgrade
steps are run and the config file will have 1.18 written
to it, allowing 1.20 to know that it is upgrding from
1.18 etc.
To post a comment you must log in.
Revision history for this message
| Ian Booth (wallyworld) wrote : | # |
Revision history for this message
| Tim Penhey (thumper) wrote : | # |
https:/
File agent/agent.go (right):
https:/
agent/agent.go:412: return c.Write()
If c.Write fails we now have the wrong version stored locally.
Care to fix that?
https:/
File agent/agent_test.go (right):
https:/
agent/agent_
these variable names no longer make sense.
https:/
File agent/format-
https:/
agent/format-
I find this much more complicated to follow than a version that doesn't
have named params:
func (*formatter_1_16) upgradedToVersi
error) {
if value != "" {
return version.
}
return version.
}
Revision history for this message
| Ian Booth (wallyworld) wrote : | # |
Please take a look.
https:/
File agent/agent_test.go (right):
https:/
agent/agent_
On 2014/02/26 02:23:41, thumper wrote:
> these variable names no longer make sense.
Done.
https:/
File agent/format-
https:/
agent/format-
On 2014/02/26 02:23:41, thumper wrote:
> I find this much more complicated to follow than a version that
doesn't have
> named params:
> func (*formatter_1_16) upgradedToVersi
(version.Number, error) {
> if value != "" {
> return version.
> }
> return version.
> }
Done.
Revision history for this message
| Ian Booth (wallyworld) wrote : | # |
https:/
File agent/agent.go (right):
https:/
agent/agent.go:412: return c.Write()
On 2014/02/26 02:23:41, thumper wrote:
> If c.Write fails we now have the wrong version stored locally.
> Care to fix that?
Done.
Revision history for this message
| Tim Penhey (thumper) wrote : | # |
Revision history for this message
| Tim Penhey (thumper) : | # |
review:
Approve
Revision history for this message
| Go Bot (go-bot) wrote : | # |
Download full text (9.6 KiB)
The attempt to merge lp:~wallyworld/juju-core/agent-conf-upgradedto into lp:juju-core failed. Below is the output from the failed tests.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
? launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
? launchpad.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'agent/agent.go' | |||
| 2 | --- agent/agent.go 2014-02-18 05:43:06 +0000 | |||
| 3 | +++ agent/agent.go 2014-02-26 03:43:42 +0000 | |||
| 4 | @@ -17,6 +17,7 @@ | |||
| 5 | 17 | "launchpad.net/juju-core/state/api" | 17 | "launchpad.net/juju-core/state/api" |
| 6 | 18 | "launchpad.net/juju-core/state/api/params" | 18 | "launchpad.net/juju-core/state/api/params" |
| 7 | 19 | "launchpad.net/juju-core/utils" | 19 | "launchpad.net/juju-core/utils" |
| 8 | 20 | "launchpad.net/juju-core/version" | ||
| 9 | 20 | ) | 21 | ) |
| 10 | 21 | 22 | ||
| 11 | 22 | var logger = loggo.GetLogger("juju.agent") | 23 | var logger = loggo.GetLogger("juju.agent") |
| 12 | @@ -88,6 +89,14 @@ | |||
| 13 | 88 | // APIServerDetails returns the details needed to run an API server. | 89 | // APIServerDetails returns the details needed to run an API server. |
| 14 | 89 | APIServerDetails() (port int, cert, key []byte) | 90 | APIServerDetails() (port int, cert, key []byte) |
| 15 | 90 | 91 | ||
| 16 | 92 | // UpgradedToVersion returns the version for which all upgrade steps have been | ||
| 17 | 93 | // successfully run, which is also the same as the initially deployed version. | ||
| 18 | 94 | UpgradedToVersion() version.Number | ||
| 19 | 95 | |||
| 20 | 96 | // WriteUpgradedToVersion updates the config's UpgradedToVersion and writes | ||
| 21 | 97 | // the new agent configuration. | ||
| 22 | 98 | WriteUpgradedToVersion(newVersion version.Number) error | ||
| 23 | 99 | |||
| 24 | 91 | // Value returns the value associated with the key, or an empty string if | 100 | // Value returns the value associated with the key, or an empty string if |
| 25 | 92 | // the key is not found. | 101 | // the key is not found. |
| 26 | 93 | Value(key string) string | 102 | Value(key string) string |
| 27 | @@ -122,63 +131,69 @@ | |||
| 28 | 122 | } | 131 | } |
| 29 | 123 | 132 | ||
| 30 | 124 | type configInternal struct { | 133 | type configInternal struct { |
| 42 | 125 | dataDir string | 134 | dataDir string |
| 43 | 126 | tag string | 135 | tag string |
| 44 | 127 | nonce string | 136 | upgradedToVersion version.Number |
| 45 | 128 | caCert []byte | 137 | nonce string |
| 46 | 129 | stateDetails *connectionDetails | 138 | caCert []byte |
| 47 | 130 | apiDetails *connectionDetails | 139 | stateDetails *connectionDetails |
| 48 | 131 | oldPassword string | 140 | apiDetails *connectionDetails |
| 49 | 132 | stateServerCert []byte | 141 | oldPassword string |
| 50 | 133 | stateServerKey []byte | 142 | stateServerCert []byte |
| 51 | 134 | apiPort int | 143 | stateServerKey []byte |
| 52 | 135 | values map[string]string | 144 | apiPort int |
| 53 | 145 | values map[string]string | ||
| 54 | 136 | } | 146 | } |
| 55 | 137 | 147 | ||
| 56 | 138 | type AgentConfigParams struct { | 148 | type AgentConfigParams struct { |
| 65 | 139 | DataDir string | 149 | DataDir string |
| 66 | 140 | Tag string | 150 | Tag string |
| 67 | 141 | Password string | 151 | UpgradedToVersion version.Number |
| 68 | 142 | Nonce string | 152 | Password string |
| 69 | 143 | StateAddresses []string | 153 | Nonce string |
| 70 | 144 | APIAddresses []string | 154 | StateAddresses []string |
| 71 | 145 | CACert []byte | 155 | APIAddresses []string |
| 72 | 146 | Values map[string]string | 156 | CACert []byte |
| 73 | 157 | Values map[string]string | ||
| 74 | 147 | } | 158 | } |
| 75 | 148 | 159 | ||
| 76 | 149 | // NewAgentConfig returns a new config object suitable for use for a | 160 | // NewAgentConfig returns a new config object suitable for use for a |
| 77 | 150 | // machine or unit agent. | 161 | // machine or unit agent. |
| 80 | 151 | func NewAgentConfig(params AgentConfigParams) (Config, error) { | 162 | func NewAgentConfig(configParams AgentConfigParams) (Config, error) { |
| 81 | 152 | if params.DataDir == "" { | 163 | if configParams.DataDir == "" { |
| 82 | 153 | return nil, errgo.Trace(requiredError("data directory")) | 164 | return nil, errgo.Trace(requiredError("data directory")) |
| 83 | 154 | } | 165 | } |
| 85 | 155 | if params.Tag == "" { | 166 | if configParams.Tag == "" { |
| 86 | 156 | return nil, errgo.Trace(requiredError("entity tag")) | 167 | return nil, errgo.Trace(requiredError("entity tag")) |
| 87 | 157 | } | 168 | } |
| 89 | 158 | if params.Password == "" { | 169 | if configParams.UpgradedToVersion == version.Zero { |
| 90 | 170 | return nil, errgo.Trace(requiredError("upgradedToVersion")) | ||
| 91 | 171 | } | ||
| 92 | 172 | if configParams.Password == "" { | ||
| 93 | 159 | return nil, errgo.Trace(requiredError("password")) | 173 | return nil, errgo.Trace(requiredError("password")) |
| 94 | 160 | } | 174 | } |
| 96 | 161 | if params.CACert == nil { | 175 | if configParams.CACert == nil { |
| 97 | 162 | return nil, errgo.Trace(requiredError("CA certificate")) | 176 | return nil, errgo.Trace(requiredError("CA certificate")) |
| 98 | 163 | } | 177 | } |
| 99 | 164 | // Note that the password parts of the state and api information are | 178 | // Note that the password parts of the state and api information are |
| 100 | 165 | // blank. This is by design. | 179 | // blank. This is by design. |
| 101 | 166 | config := &configInternal{ | 180 | config := &configInternal{ |
| 108 | 167 | dataDir: params.DataDir, | 181 | dataDir: configParams.DataDir, |
| 109 | 168 | tag: params.Tag, | 182 | tag: configParams.Tag, |
| 110 | 169 | nonce: params.Nonce, | 183 | upgradedToVersion: configParams.UpgradedToVersion, |
| 111 | 170 | caCert: params.CACert, | 184 | nonce: configParams.Nonce, |
| 112 | 171 | oldPassword: params.Password, | 185 | caCert: configParams.CACert, |
| 113 | 172 | values: params.Values, | 186 | oldPassword: configParams.Password, |
| 114 | 187 | values: configParams.Values, | ||
| 115 | 173 | } | 188 | } |
| 117 | 174 | if len(params.StateAddresses) > 0 { | 189 | if len(configParams.StateAddresses) > 0 { |
| 118 | 175 | config.stateDetails = &connectionDetails{ | 190 | config.stateDetails = &connectionDetails{ |
| 120 | 176 | addresses: params.StateAddresses, | 191 | addresses: configParams.StateAddresses, |
| 121 | 177 | } | 192 | } |
| 122 | 178 | } | 193 | } |
| 124 | 179 | if len(params.APIAddresses) > 0 { | 194 | if len(configParams.APIAddresses) > 0 { |
| 125 | 180 | config.apiDetails = &connectionDetails{ | 195 | config.apiDetails = &connectionDetails{ |
| 127 | 181 | addresses: params.APIAddresses, | 196 | addresses: configParams.APIAddresses, |
| 128 | 182 | } | 197 | } |
| 129 | 183 | } | 198 | } |
| 130 | 184 | if err := config.check(); err != nil { | 199 | if err := config.check(); err != nil { |
| 131 | @@ -200,21 +215,21 @@ | |||
| 132 | 200 | 215 | ||
| 133 | 201 | // NewStateMachineConfig returns a configuration suitable for | 216 | // NewStateMachineConfig returns a configuration suitable for |
| 134 | 202 | // a machine running the state server. | 217 | // a machine running the state server. |
| 137 | 203 | func NewStateMachineConfig(params StateMachineConfigParams) (Config, error) { | 218 | func NewStateMachineConfig(configParams StateMachineConfigParams) (Config, error) { |
| 138 | 204 | if params.StateServerCert == nil { | 219 | if configParams.StateServerCert == nil { |
| 139 | 205 | return nil, errgo.Trace(requiredError("state server cert")) | 220 | return nil, errgo.Trace(requiredError("state server cert")) |
| 140 | 206 | } | 221 | } |
| 142 | 207 | if params.StateServerKey == nil { | 222 | if configParams.StateServerKey == nil { |
| 143 | 208 | return nil, errgo.Trace(requiredError("state server key")) | 223 | return nil, errgo.Trace(requiredError("state server key")) |
| 144 | 209 | } | 224 | } |
| 146 | 210 | config0, err := NewAgentConfig(params.AgentConfigParams) | 225 | config0, err := NewAgentConfig(configParams.AgentConfigParams) |
| 147 | 211 | if err != nil { | 226 | if err != nil { |
| 148 | 212 | return nil, err | 227 | return nil, err |
| 149 | 213 | } | 228 | } |
| 150 | 214 | config := config0.(*configInternal) | 229 | config := config0.(*configInternal) |
| 154 | 215 | config.stateServerCert = params.StateServerCert | 230 | config.stateServerCert = configParams.StateServerCert |
| 155 | 216 | config.stateServerKey = params.StateServerKey | 231 | config.stateServerKey = configParams.StateServerKey |
| 156 | 217 | config.apiPort = params.APIPort | 232 | config.apiPort = configParams.APIPort |
| 157 | 218 | return config, nil | 233 | return config, nil |
| 158 | 219 | } | 234 | } |
| 159 | 220 | 235 | ||
| 160 | @@ -279,6 +294,10 @@ | |||
| 161 | 279 | return c.nonce | 294 | return c.nonce |
| 162 | 280 | } | 295 | } |
| 163 | 281 | 296 | ||
| 164 | 297 | func (c *configInternal) UpgradedToVersion() version.Number { | ||
| 165 | 298 | return c.upgradedToVersion | ||
| 166 | 299 | } | ||
| 167 | 300 | |||
| 168 | 282 | func (c *configInternal) CACert() []byte { | 301 | func (c *configInternal) CACert() []byte { |
| 169 | 283 | // Give the caller their own copy of the cert to avoid any possibility of | 302 | // Give the caller their own copy of the cert to avoid any possibility of |
| 170 | 284 | // modifying the config's copy. | 303 | // modifying the config's copy. |
| 171 | @@ -388,6 +407,17 @@ | |||
| 172 | 388 | return currentFormatter.write(c) | 407 | return currentFormatter.write(c) |
| 173 | 389 | } | 408 | } |
| 174 | 390 | 409 | ||
| 175 | 410 | func (c *configInternal) WriteUpgradedToVersion(newVersion version.Number) error { | ||
| 176 | 411 | originalVersion := c.upgradedToVersion | ||
| 177 | 412 | c.upgradedToVersion = newVersion | ||
| 178 | 413 | err := c.Write() | ||
| 179 | 414 | if err != nil { | ||
| 180 | 415 | // We don't want to retain the new version if there's been an error writing the file. | ||
| 181 | 416 | c.upgradedToVersion = originalVersion | ||
| 182 | 417 | } | ||
| 183 | 418 | return err | ||
| 184 | 419 | } | ||
| 185 | 420 | |||
| 186 | 391 | func (c *configInternal) WriteCommands() ([]string, error) { | 421 | func (c *configInternal) WriteCommands() ([]string, error) { |
| 187 | 392 | return currentFormatter.writeCommands(c) | 422 | return currentFormatter.writeCommands(c) |
| 188 | 393 | } | 423 | } |
| 189 | 394 | 424 | ||
| 190 | === modified file 'agent/agent_test.go' | |||
| 191 | --- agent/agent_test.go 2013-11-19 13:23:51 +0000 | |||
| 192 | +++ agent/agent_test.go 2014-02-26 03:43:42 +0000 | |||
| 193 | @@ -8,6 +8,7 @@ | |||
| 194 | 8 | 8 | ||
| 195 | 9 | "launchpad.net/juju-core/agent" | 9 | "launchpad.net/juju-core/agent" |
| 196 | 10 | "launchpad.net/juju-core/testing/testbase" | 10 | "launchpad.net/juju-core/testing/testbase" |
| 197 | 11 | "launchpad.net/juju-core/version" | ||
| 198 | 11 | ) | 12 | ) |
| 199 | 12 | 13 | ||
| 200 | 13 | type suite struct { | 14 | type suite struct { |
| 201 | @@ -30,87 +31,103 @@ | |||
| 202 | 30 | }, | 31 | }, |
| 203 | 31 | checkErr: "entity tag not found in configuration", | 32 | checkErr: "entity tag not found in configuration", |
| 204 | 32 | }, { | 33 | }, { |
| 205 | 34 | about: "missing upgraded to version", | ||
| 206 | 35 | params: agent.AgentConfigParams{ | ||
| 207 | 36 | DataDir: "/data/dir", | ||
| 208 | 37 | Tag: "omg", | ||
| 209 | 38 | }, | ||
| 210 | 39 | checkErr: "upgradedToVersion not found in configuration", | ||
| 211 | 40 | }, { | ||
| 212 | 33 | about: "missing password", | 41 | about: "missing password", |
| 213 | 34 | params: agent.AgentConfigParams{ | 42 | params: agent.AgentConfigParams{ |
| 216 | 35 | DataDir: "/data/dir", | 43 | DataDir: "/data/dir", |
| 217 | 36 | Tag: "omg", | 44 | Tag: "omg", |
| 218 | 45 | UpgradedToVersion: version.Current.Number, | ||
| 219 | 37 | }, | 46 | }, |
| 220 | 38 | checkErr: "password not found in configuration", | 47 | checkErr: "password not found in configuration", |
| 221 | 39 | }, { | 48 | }, { |
| 222 | 40 | about: "missing CA cert", | 49 | about: "missing CA cert", |
| 223 | 41 | params: agent.AgentConfigParams{ | 50 | params: agent.AgentConfigParams{ |
| 227 | 42 | DataDir: "/data/dir", | 51 | DataDir: "/data/dir", |
| 228 | 43 | Tag: "omg", | 52 | Tag: "omg", |
| 229 | 44 | Password: "sekrit", | 53 | UpgradedToVersion: version.Current.Number, |
| 230 | 54 | Password: "sekrit", | ||
| 231 | 45 | }, | 55 | }, |
| 232 | 46 | checkErr: "CA certificate not found in configuration", | 56 | checkErr: "CA certificate not found in configuration", |
| 233 | 47 | }, { | 57 | }, { |
| 234 | 48 | about: "need either state or api addresses", | 58 | about: "need either state or api addresses", |
| 235 | 49 | params: agent.AgentConfigParams{ | 59 | params: agent.AgentConfigParams{ |
| 240 | 50 | DataDir: "/data/dir", | 60 | DataDir: "/data/dir", |
| 241 | 51 | Tag: "omg", | 61 | Tag: "omg", |
| 242 | 52 | Password: "sekrit", | 62 | UpgradedToVersion: version.Current.Number, |
| 243 | 53 | CACert: []byte("ca cert"), | 63 | Password: "sekrit", |
| 244 | 64 | CACert: []byte("ca cert"), | ||
| 245 | 54 | }, | 65 | }, |
| 246 | 55 | checkErr: "state or API addresses not found in configuration", | 66 | checkErr: "state or API addresses not found in configuration", |
| 247 | 56 | }, { | 67 | }, { |
| 248 | 57 | about: "invalid state address", | 68 | about: "invalid state address", |
| 249 | 58 | params: agent.AgentConfigParams{ | 69 | params: agent.AgentConfigParams{ |
| 255 | 59 | DataDir: "/data/dir", | 70 | DataDir: "/data/dir", |
| 256 | 60 | Tag: "omg", | 71 | Tag: "omg", |
| 257 | 61 | Password: "sekrit", | 72 | UpgradedToVersion: version.Current.Number, |
| 258 | 62 | CACert: []byte("ca cert"), | 73 | Password: "sekrit", |
| 259 | 63 | StateAddresses: []string{"localhost:8080", "bad-address"}, | 74 | CACert: []byte("ca cert"), |
| 260 | 75 | StateAddresses: []string{"localhost:8080", "bad-address"}, | ||
| 261 | 64 | }, | 76 | }, |
| 262 | 65 | checkErr: `invalid state server address "bad-address"`, | 77 | checkErr: `invalid state server address "bad-address"`, |
| 263 | 66 | }, { | 78 | }, { |
| 264 | 67 | about: "invalid api address", | 79 | about: "invalid api address", |
| 265 | 68 | params: agent.AgentConfigParams{ | 80 | params: agent.AgentConfigParams{ |
| 271 | 69 | DataDir: "/data/dir", | 81 | DataDir: "/data/dir", |
| 272 | 70 | Tag: "omg", | 82 | Tag: "omg", |
| 273 | 71 | Password: "sekrit", | 83 | UpgradedToVersion: version.Current.Number, |
| 274 | 72 | CACert: []byte("ca cert"), | 84 | Password: "sekrit", |
| 275 | 73 | APIAddresses: []string{"localhost:8080", "bad-address"}, | 85 | CACert: []byte("ca cert"), |
| 276 | 86 | APIAddresses: []string{"localhost:8080", "bad-address"}, | ||
| 277 | 74 | }, | 87 | }, |
| 278 | 75 | checkErr: `invalid API server address "bad-address"`, | 88 | checkErr: `invalid API server address "bad-address"`, |
| 279 | 76 | }, { | 89 | }, { |
| 280 | 77 | about: "good state addresses", | 90 | about: "good state addresses", |
| 281 | 78 | params: agent.AgentConfigParams{ | 91 | params: agent.AgentConfigParams{ |
| 287 | 79 | DataDir: "/data/dir", | 92 | DataDir: "/data/dir", |
| 288 | 80 | Tag: "omg", | 93 | Tag: "omg", |
| 289 | 81 | Password: "sekrit", | 94 | UpgradedToVersion: version.Current.Number, |
| 290 | 82 | CACert: []byte("ca cert"), | 95 | Password: "sekrit", |
| 291 | 83 | StateAddresses: []string{"localhost:1234"}, | 96 | CACert: []byte("ca cert"), |
| 292 | 97 | StateAddresses: []string{"localhost:1234"}, | ||
| 293 | 84 | }, | 98 | }, |
| 294 | 85 | }, { | 99 | }, { |
| 295 | 86 | about: "good api addresses", | 100 | about: "good api addresses", |
| 296 | 87 | params: agent.AgentConfigParams{ | 101 | params: agent.AgentConfigParams{ |
| 302 | 88 | DataDir: "/data/dir", | 102 | DataDir: "/data/dir", |
| 303 | 89 | Tag: "omg", | 103 | Tag: "omg", |
| 304 | 90 | Password: "sekrit", | 104 | UpgradedToVersion: version.Current.Number, |
| 305 | 91 | CACert: []byte("ca cert"), | 105 | Password: "sekrit", |
| 306 | 92 | APIAddresses: []string{"localhost:1234"}, | 106 | CACert: []byte("ca cert"), |
| 307 | 107 | APIAddresses: []string{"localhost:1234"}, | ||
| 308 | 93 | }, | 108 | }, |
| 309 | 94 | }, { | 109 | }, { |
| 310 | 95 | about: "both state and api addresses", | 110 | about: "both state and api addresses", |
| 311 | 96 | params: agent.AgentConfigParams{ | 111 | params: agent.AgentConfigParams{ |
| 318 | 97 | DataDir: "/data/dir", | 112 | DataDir: "/data/dir", |
| 319 | 98 | Tag: "omg", | 113 | Tag: "omg", |
| 320 | 99 | Password: "sekrit", | 114 | UpgradedToVersion: version.Current.Number, |
| 321 | 100 | CACert: []byte("ca cert"), | 115 | Password: "sekrit", |
| 322 | 101 | StateAddresses: []string{"localhost:1234"}, | 116 | CACert: []byte("ca cert"), |
| 323 | 102 | APIAddresses: []string{"localhost:1235"}, | 117 | StateAddresses: []string{"localhost:1234"}, |
| 324 | 118 | APIAddresses: []string{"localhost:1235"}, | ||
| 325 | 103 | }, | 119 | }, |
| 326 | 104 | }, { | 120 | }, { |
| 327 | 105 | about: "everything...", | 121 | about: "everything...", |
| 328 | 106 | params: agent.AgentConfigParams{ | 122 | params: agent.AgentConfigParams{ |
| 336 | 107 | DataDir: "/data/dir", | 123 | DataDir: "/data/dir", |
| 337 | 108 | Tag: "omg", | 124 | Tag: "omg", |
| 338 | 109 | Password: "sekrit", | 125 | Password: "sekrit", |
| 339 | 110 | CACert: []byte("ca cert"), | 126 | UpgradedToVersion: version.Current.Number, |
| 340 | 111 | StateAddresses: []string{"localhost:1234"}, | 127 | CACert: []byte("ca cert"), |
| 341 | 112 | APIAddresses: []string{"localhost:1235"}, | 128 | StateAddresses: []string{"localhost:1234"}, |
| 342 | 113 | Nonce: "a nonce", | 129 | APIAddresses: []string{"localhost:1235"}, |
| 343 | 130 | Nonce: "a nonce", | ||
| 344 | 114 | }, | 131 | }, |
| 345 | 115 | }} | 132 | }} |
| 346 | 116 | 133 | ||
| 347 | @@ -168,13 +185,14 @@ | |||
| 348 | 168 | } | 185 | } |
| 349 | 169 | 186 | ||
| 350 | 170 | var attributeParams = agent.AgentConfigParams{ | 187 | var attributeParams = agent.AgentConfigParams{ |
| 358 | 171 | DataDir: "/data/dir", | 188 | DataDir: "/data/dir", |
| 359 | 172 | Tag: "omg", | 189 | Tag: "omg", |
| 360 | 173 | Password: "sekrit", | 190 | UpgradedToVersion: version.Current.Number, |
| 361 | 174 | CACert: []byte("ca cert"), | 191 | Password: "sekrit", |
| 362 | 175 | StateAddresses: []string{"localhost:1234"}, | 192 | CACert: []byte("ca cert"), |
| 363 | 176 | APIAddresses: []string{"localhost:1235"}, | 193 | StateAddresses: []string{"localhost:1234"}, |
| 364 | 177 | Nonce: "a nonce", | 194 | APIAddresses: []string{"localhost:1235"}, |
| 365 | 195 | Nonce: "a nonce", | ||
| 366 | 178 | } | 196 | } |
| 367 | 179 | 197 | ||
| 368 | 180 | func (*suite) TestAttributes(c *gc.C) { | 198 | func (*suite) TestAttributes(c *gc.C) { |
| 369 | @@ -184,6 +202,7 @@ | |||
| 370 | 184 | c.Assert(conf.Tag(), gc.Equals, "omg") | 202 | c.Assert(conf.Tag(), gc.Equals, "omg") |
| 371 | 185 | c.Assert(conf.Dir(), gc.Equals, "/data/dir/agents/omg") | 203 | c.Assert(conf.Dir(), gc.Equals, "/data/dir/agents/omg") |
| 372 | 186 | c.Assert(conf.Nonce(), gc.Equals, "a nonce") | 204 | c.Assert(conf.Nonce(), gc.Equals, "a nonce") |
| 373 | 205 | c.Assert(conf.UpgradedToVersion(), gc.DeepEquals, version.Current.Number) | ||
| 374 | 187 | } | 206 | } |
| 375 | 188 | 207 | ||
| 376 | 189 | func (s *suite) TestApiAddressesCantWriteBack(c *gc.C) { | 208 | func (s *suite) TestApiAddressesCantWriteBack(c *gc.C) { |
| 377 | @@ -198,22 +217,27 @@ | |||
| 378 | 198 | c.Assert(err, gc.IsNil) | 217 | c.Assert(err, gc.IsNil) |
| 379 | 199 | c.Assert(newValue, gc.DeepEquals, []string{"localhost:1235"}) | 218 | c.Assert(newValue, gc.DeepEquals, []string{"localhost:1235"}) |
| 380 | 200 | } | 219 | } |
| 381 | 201 | func (*suite) TestWriteAndRead(c *gc.C) { | ||
| 382 | 202 | testParams := attributeParams | ||
| 383 | 203 | testParams.DataDir = c.MkDir() | ||
| 384 | 204 | conf, err := agent.NewAgentConfig(testParams) | ||
| 385 | 205 | c.Assert(err, gc.IsNil) | ||
| 386 | 206 | 220 | ||
| 390 | 207 | c.Assert(conf.Write(), gc.IsNil) | 221 | func assertConfigEqual(c *gc.C, c1, c2 agent.Config) { |
| 388 | 208 | reread, err := agent.ReadConf(conf.DataDir(), conf.Tag()) | ||
| 389 | 209 | c.Assert(err, gc.IsNil) | ||
| 391 | 210 | // Since we can't directly poke the internals, we'll use the WriteCommands | 222 | // Since we can't directly poke the internals, we'll use the WriteCommands |
| 392 | 211 | // method. | 223 | // method. |
| 398 | 212 | confCommands, err := conf.WriteCommands() | 224 | conf1Commands, err := c1.WriteCommands() |
| 399 | 213 | c.Assert(err, gc.IsNil) | 225 | c.Assert(err, gc.IsNil) |
| 400 | 214 | rereadCommands, err := reread.WriteCommands() | 226 | conf2Commands, err := c2.WriteCommands() |
| 401 | 215 | c.Assert(err, gc.IsNil) | 227 | c.Assert(err, gc.IsNil) |
| 402 | 216 | c.Assert(confCommands, gc.DeepEquals, rereadCommands) | 228 | c.Assert(conf1Commands, gc.DeepEquals, conf2Commands) |
| 403 | 229 | } | ||
| 404 | 230 | |||
| 405 | 231 | func (*suite) TestWriteAndRead(c *gc.C) { | ||
| 406 | 232 | testParams := attributeParams | ||
| 407 | 233 | testParams.DataDir = c.MkDir() | ||
| 408 | 234 | conf, err := agent.NewAgentConfig(testParams) | ||
| 409 | 235 | c.Assert(err, gc.IsNil) | ||
| 410 | 236 | |||
| 411 | 237 | c.Assert(conf.Write(), gc.IsNil) | ||
| 412 | 238 | reread, err := agent.ReadConf(conf.DataDir(), conf.Tag()) | ||
| 413 | 239 | c.Assert(err, gc.IsNil) | ||
| 414 | 240 | assertConfigEqual(c, conf, reread) | ||
| 415 | 217 | } | 241 | } |
| 416 | 218 | 242 | ||
| 417 | 219 | func (*suite) TestWriteNewPassword(c *gc.C) { | 243 | func (*suite) TestWriteNewPassword(c *gc.C) { |
| 418 | @@ -224,30 +248,33 @@ | |||
| 419 | 224 | }{{ | 248 | }{{ |
| 420 | 225 | about: "good state addresses", | 249 | about: "good state addresses", |
| 421 | 226 | params: agent.AgentConfigParams{ | 250 | params: agent.AgentConfigParams{ |
| 427 | 227 | DataDir: c.MkDir(), | 251 | DataDir: c.MkDir(), |
| 428 | 228 | Tag: "omg", | 252 | Tag: "omg", |
| 429 | 229 | Password: "sekrit", | 253 | UpgradedToVersion: version.Current.Number, |
| 430 | 230 | CACert: []byte("ca cert"), | 254 | Password: "sekrit", |
| 431 | 231 | StateAddresses: []string{"localhost:1234"}, | 255 | CACert: []byte("ca cert"), |
| 432 | 256 | StateAddresses: []string{"localhost:1234"}, | ||
| 433 | 232 | }, | 257 | }, |
| 434 | 233 | }, { | 258 | }, { |
| 435 | 234 | about: "good api addresses", | 259 | about: "good api addresses", |
| 436 | 235 | params: agent.AgentConfigParams{ | 260 | params: agent.AgentConfigParams{ |
| 442 | 236 | DataDir: c.MkDir(), | 261 | DataDir: c.MkDir(), |
| 443 | 237 | Tag: "omg", | 262 | Tag: "omg", |
| 444 | 238 | Password: "sekrit", | 263 | UpgradedToVersion: version.Current.Number, |
| 445 | 239 | CACert: []byte("ca cert"), | 264 | Password: "sekrit", |
| 446 | 240 | APIAddresses: []string{"localhost:1234"}, | 265 | CACert: []byte("ca cert"), |
| 447 | 266 | APIAddresses: []string{"localhost:1234"}, | ||
| 448 | 241 | }, | 267 | }, |
| 449 | 242 | }, { | 268 | }, { |
| 450 | 243 | about: "both state and api addresses", | 269 | about: "both state and api addresses", |
| 451 | 244 | params: agent.AgentConfigParams{ | 270 | params: agent.AgentConfigParams{ |
| 458 | 245 | DataDir: c.MkDir(), | 271 | DataDir: c.MkDir(), |
| 459 | 246 | Tag: "omg", | 272 | Tag: "omg", |
| 460 | 247 | Password: "sekrit", | 273 | UpgradedToVersion: version.Current.Number, |
| 461 | 248 | CACert: []byte("ca cert"), | 274 | Password: "sekrit", |
| 462 | 249 | StateAddresses: []string{"localhost:1234"}, | 275 | CACert: []byte("ca cert"), |
| 463 | 250 | APIAddresses: []string{"localhost:1235"}, | 276 | StateAddresses: []string{"localhost:1234"}, |
| 464 | 277 | APIAddresses: []string{"localhost:1235"}, | ||
| 465 | 251 | }, | 278 | }, |
| 466 | 252 | }} { | 279 | }} { |
| 467 | 253 | c.Logf("%v: %s", i, test.about) | 280 | c.Logf("%v: %s", i, test.about) |
| 468 | @@ -263,6 +290,23 @@ | |||
| 469 | 263 | } | 290 | } |
| 470 | 264 | } | 291 | } |
| 471 | 265 | 292 | ||
| 472 | 293 | func (*suite) TestWriteUpgradedToVersion(c *gc.C) { | ||
| 473 | 294 | testParams := attributeParams | ||
| 474 | 295 | testParams.DataDir = c.MkDir() | ||
| 475 | 296 | conf, err := agent.NewAgentConfig(testParams) | ||
| 476 | 297 | c.Assert(err, gc.IsNil) | ||
| 477 | 298 | c.Assert(conf.Write(), gc.IsNil) | ||
| 478 | 299 | |||
| 479 | 300 | newVersion := version.Current.Number | ||
| 480 | 301 | newVersion.Major++ | ||
| 481 | 302 | c.Assert(conf.WriteUpgradedToVersion(newVersion), gc.IsNil) | ||
| 482 | 303 | c.Assert(conf.UpgradedToVersion(), gc.DeepEquals, newVersion) | ||
| 483 | 304 | |||
| 484 | 305 | // Show that the upgradedToVersion is saved. | ||
| 485 | 306 | reread, err := agent.ReadConf(conf.DataDir(), conf.Tag()) | ||
| 486 | 307 | assertConfigEqual(c, conf, reread) | ||
| 487 | 308 | } | ||
| 488 | 309 | |||
| 489 | 266 | // Actual opening of state and api requires a lot more boiler plate to make | 310 | // Actual opening of state and api requires a lot more boiler plate to make |
| 490 | 267 | // sure they are valid connections. This is done in the cmd/jujud tests for | 311 | // sure they are valid connections. This is done in the cmd/jujud tests for |
| 491 | 268 | // bootstrap, machine and unit tests. | 312 | // bootstrap, machine and unit tests. |
| 492 | 269 | 313 | ||
| 493 | === modified file 'agent/bootstrap_test.go' | |||
| 494 | --- agent/bootstrap_test.go 2014-02-19 06:50:24 +0000 | |||
| 495 | +++ agent/bootstrap_test.go 2014-02-26 03:43:42 +0000 | |||
| 496 | @@ -51,11 +51,12 @@ | |||
| 497 | 51 | 51 | ||
| 498 | 52 | pwHash := utils.UserPasswordHash(testing.DefaultMongoPassword, utils.CompatSalt) | 52 | pwHash := utils.UserPasswordHash(testing.DefaultMongoPassword, utils.CompatSalt) |
| 499 | 53 | cfg, err := agent.NewAgentConfig(agent.AgentConfigParams{ | 53 | cfg, err := agent.NewAgentConfig(agent.AgentConfigParams{ |
| 505 | 54 | DataDir: dataDir, | 54 | DataDir: dataDir, |
| 506 | 55 | Tag: "machine-0", | 55 | Tag: "machine-0", |
| 507 | 56 | StateAddresses: []string{testing.MgoServer.Addr()}, | 56 | UpgradedToVersion: version.Current.Number, |
| 508 | 57 | CACert: []byte(testing.CACert), | 57 | StateAddresses: []string{testing.MgoServer.Addr()}, |
| 509 | 58 | Password: pwHash, | 58 | CACert: []byte(testing.CACert), |
| 510 | 59 | Password: pwHash, | ||
| 511 | 59 | }) | 60 | }) |
| 512 | 60 | c.Assert(err, gc.IsNil) | 61 | c.Assert(err, gc.IsNil) |
| 513 | 61 | expectConstraints := constraints.MustParse("mem=1024M") | 62 | expectConstraints := constraints.MustParse("mem=1024M") |
| 514 | @@ -116,11 +117,12 @@ | |||
| 515 | 116 | dataDir := c.MkDir() | 117 | dataDir := c.MkDir() |
| 516 | 117 | pwHash := utils.UserPasswordHash(testing.DefaultMongoPassword, utils.CompatSalt) | 118 | pwHash := utils.UserPasswordHash(testing.DefaultMongoPassword, utils.CompatSalt) |
| 517 | 118 | cfg, err := agent.NewAgentConfig(agent.AgentConfigParams{ | 119 | cfg, err := agent.NewAgentConfig(agent.AgentConfigParams{ |
| 523 | 119 | DataDir: dataDir, | 120 | DataDir: dataDir, |
| 524 | 120 | Tag: "machine-0", | 121 | Tag: "machine-0", |
| 525 | 121 | StateAddresses: []string{testing.MgoServer.Addr()}, | 122 | UpgradedToVersion: version.Current.Number, |
| 526 | 122 | CACert: []byte(testing.CACert), | 123 | StateAddresses: []string{testing.MgoServer.Addr()}, |
| 527 | 123 | Password: pwHash, | 124 | CACert: []byte(testing.CACert), |
| 528 | 125 | Password: pwHash, | ||
| 529 | 124 | }) | 126 | }) |
| 530 | 125 | c.Assert(err, gc.IsNil) | 127 | c.Assert(err, gc.IsNil) |
| 531 | 126 | expectConstraints := constraints.MustParse("mem=1024M") | 128 | expectConstraints := constraints.MustParse("mem=1024M") |
| 532 | 127 | 129 | ||
| 533 | === modified file 'agent/format-1.12_whitebox_test.go' | |||
| 534 | --- agent/format-1.12_whitebox_test.go 2013-10-04 16:16:10 +0000 | |||
| 535 | +++ agent/format-1.12_whitebox_test.go 2014-02-26 03:43:42 +0000 | |||
| 536 | @@ -11,6 +11,7 @@ | |||
| 537 | 11 | 11 | ||
| 538 | 12 | jc "launchpad.net/juju-core/testing/checkers" | 12 | jc "launchpad.net/juju-core/testing/checkers" |
| 539 | 13 | "launchpad.net/juju-core/testing/testbase" | 13 | "launchpad.net/juju-core/testing/testbase" |
| 540 | 14 | "launchpad.net/juju-core/version" | ||
| 541 | 14 | ) | 15 | ) |
| 542 | 15 | 16 | ||
| 543 | 16 | type format_1_12Suite struct { | 17 | type format_1_12Suite struct { |
| 544 | @@ -42,6 +43,8 @@ | |||
| 545 | 42 | } | 43 | } |
| 546 | 43 | 44 | ||
| 547 | 44 | func (s *format_1_12Suite) assertWriteAndRead(c *gc.C, config *configInternal) { | 45 | func (s *format_1_12Suite) assertWriteAndRead(c *gc.C, config *configInternal) { |
| 548 | 46 | // Format 1.12 doesn't know about upgradedToVersion so zero it out. | ||
| 549 | 47 | config.upgradedToVersion = version.Zero | ||
| 550 | 45 | err := s.formatter.write(config) | 48 | err := s.formatter.write(config) |
| 551 | 46 | c.Assert(err, gc.IsNil) | 49 | c.Assert(err, gc.IsNil) |
| 552 | 47 | // The readConfig is missing the dataDir initially. | 50 | // The readConfig is missing the dataDir initially. |
| 553 | 48 | 51 | ||
| 554 | === modified file 'agent/format-1.16.go' | |||
| 555 | --- agent/format-1.16.go 2014-02-12 21:14:17 +0000 | |||
| 556 | +++ agent/format-1.16.go 2014-02-26 03:43:42 +0000 | |||
| 557 | @@ -12,6 +12,7 @@ | |||
| 558 | 12 | "launchpad.net/goyaml" | 12 | "launchpad.net/goyaml" |
| 559 | 13 | 13 | ||
| 560 | 14 | "launchpad.net/juju-core/juju/osenv" | 14 | "launchpad.net/juju-core/juju/osenv" |
| 561 | 15 | "launchpad.net/juju-core/version" | ||
| 562 | 15 | ) | 16 | ) |
| 563 | 16 | 17 | ||
| 564 | 17 | const ( | 18 | const ( |
| 565 | @@ -29,8 +30,9 @@ | |||
| 566 | 29 | 30 | ||
| 567 | 30 | // format_1_16Serialization holds information for a given agent. | 31 | // format_1_16Serialization holds information for a given agent. |
| 568 | 31 | type format_1_16Serialization struct { | 32 | type format_1_16Serialization struct { |
| 571 | 32 | Tag string | 33 | Tag string |
| 572 | 33 | Nonce string | 34 | Nonce string |
| 573 | 35 | UpgradedToVersion string `yaml:"upgradedToVersion"` | ||
| 574 | 34 | // CACert is base64 encoded | 36 | // CACert is base64 encoded |
| 575 | 35 | CACert string | 37 | CACert string |
| 576 | 36 | StateAddresses []string `yaml:",omitempty"` | 38 | StateAddresses []string `yaml:",omitempty"` |
| 577 | @@ -64,6 +66,15 @@ | |||
| 578 | 64 | return | 66 | return |
| 579 | 65 | } | 67 | } |
| 580 | 66 | 68 | ||
| 581 | 69 | // upgradedToVersion parses the upgradedToVersion string value into a version.Number. | ||
| 582 | 70 | // An empty value is returned as 1.16.0. | ||
| 583 | 71 | func (*formatter_1_16) upgradedToVersion(value string) (version.Number, error) { | ||
| 584 | 72 | if value != "" { | ||
| 585 | 73 | return version.Parse(value) | ||
| 586 | 74 | } | ||
| 587 | 75 | return version.MustParse("1.16.0"), nil | ||
| 588 | 76 | } | ||
| 589 | 77 | |||
| 590 | 67 | func (formatter *formatter_1_16) read(dirName string) (*configInternal, error) { | 78 | func (formatter *formatter_1_16) read(dirName string) (*configInternal, error) { |
| 591 | 68 | data, err := ioutil.ReadFile(formatter.configFile(dirName)) | 79 | data, err := ioutil.ReadFile(formatter.configFile(dirName)) |
| 592 | 69 | if err != nil { | 80 | if err != nil { |
| 593 | @@ -85,15 +96,20 @@ | |||
| 594 | 85 | if err != nil { | 96 | if err != nil { |
| 595 | 86 | return nil, err | 97 | return nil, err |
| 596 | 87 | } | 98 | } |
| 597 | 99 | upgradedToVersion, err := formatter.upgradedToVersion(format.UpgradedToVersion) | ||
| 598 | 100 | if err != nil { | ||
| 599 | 101 | return nil, err | ||
| 600 | 102 | } | ||
| 601 | 88 | config := &configInternal{ | 103 | config := &configInternal{ |
| 610 | 89 | tag: format.Tag, | 104 | tag: format.Tag, |
| 611 | 90 | nonce: format.Nonce, | 105 | nonce: format.Nonce, |
| 612 | 91 | caCert: caCert, | 106 | upgradedToVersion: upgradedToVersion, |
| 613 | 92 | oldPassword: format.OldPassword, | 107 | caCert: caCert, |
| 614 | 93 | stateServerCert: stateServerCert, | 108 | oldPassword: format.OldPassword, |
| 615 | 94 | stateServerKey: stateServerKey, | 109 | stateServerCert: stateServerCert, |
| 616 | 95 | apiPort: format.APIPort, | 110 | stateServerKey: stateServerKey, |
| 617 | 96 | values: format.Values, | 111 | apiPort: format.APIPort, |
| 618 | 112 | values: format.Values, | ||
| 619 | 97 | } | 113 | } |
| 620 | 98 | if len(format.StateAddresses) > 0 { | 114 | if len(format.StateAddresses) > 0 { |
| 621 | 99 | config.stateDetails = &connectionDetails{ | 115 | config.stateDetails = &connectionDetails{ |
| 622 | @@ -112,14 +128,15 @@ | |||
| 623 | 112 | 128 | ||
| 624 | 113 | func (formatter *formatter_1_16) makeFormat(config *configInternal) *format_1_16Serialization { | 129 | func (formatter *formatter_1_16) makeFormat(config *configInternal) *format_1_16Serialization { |
| 625 | 114 | format := &format_1_16Serialization{ | 130 | format := &format_1_16Serialization{ |
| 634 | 115 | Tag: config.tag, | 131 | Tag: config.tag, |
| 635 | 116 | Nonce: config.nonce, | 132 | Nonce: config.nonce, |
| 636 | 117 | CACert: base64.StdEncoding.EncodeToString(config.caCert), | 133 | UpgradedToVersion: config.upgradedToVersion.String(), |
| 637 | 118 | OldPassword: config.oldPassword, | 134 | CACert: base64.StdEncoding.EncodeToString(config.caCert), |
| 638 | 119 | StateServerCert: base64.StdEncoding.EncodeToString(config.stateServerCert), | 135 | OldPassword: config.oldPassword, |
| 639 | 120 | StateServerKey: base64.StdEncoding.EncodeToString(config.stateServerKey), | 136 | StateServerCert: base64.StdEncoding.EncodeToString(config.stateServerCert), |
| 640 | 121 | APIPort: config.apiPort, | 137 | StateServerKey: base64.StdEncoding.EncodeToString(config.stateServerKey), |
| 641 | 122 | Values: config.values, | 138 | APIPort: config.apiPort, |
| 642 | 139 | Values: config.values, | ||
| 643 | 123 | } | 140 | } |
| 644 | 124 | if config.stateDetails != nil { | 141 | if config.stateDetails != nil { |
| 645 | 125 | format.StateAddresses = config.stateDetails.addresses | 142 | format.StateAddresses = config.stateDetails.addresses |
| 646 | 126 | 143 | ||
| 647 | === modified file 'agent/format-1.16_whitebox_test.go' | |||
| 648 | --- agent/format-1.16_whitebox_test.go 2014-02-12 21:14:17 +0000 | |||
| 649 | +++ agent/format-1.16_whitebox_test.go 2014-02-26 03:43:42 +0000 | |||
| 650 | @@ -8,14 +8,17 @@ | |||
| 651 | 8 | package agent | 8 | package agent |
| 652 | 9 | 9 | ||
| 653 | 10 | import ( | 10 | import ( |
| 654 | 11 | "io/ioutil" | ||
| 655 | 11 | "os" | 12 | "os" |
| 656 | 12 | "path" | 13 | "path" |
| 657 | 14 | "path/filepath" | ||
| 658 | 13 | 15 | ||
| 659 | 14 | gc "launchpad.net/gocheck" | 16 | gc "launchpad.net/gocheck" |
| 660 | 15 | 17 | ||
| 661 | 16 | "launchpad.net/juju-core/juju/osenv" | 18 | "launchpad.net/juju-core/juju/osenv" |
| 662 | 17 | jc "launchpad.net/juju-core/testing/checkers" | 19 | jc "launchpad.net/juju-core/testing/checkers" |
| 663 | 18 | "launchpad.net/juju-core/testing/testbase" | 20 | "launchpad.net/juju-core/testing/testbase" |
| 664 | 21 | "launchpad.net/juju-core/version" | ||
| 665 | 19 | ) | 22 | ) |
| 666 | 20 | 23 | ||
| 667 | 21 | type format_1_16Suite struct { | 24 | type format_1_16Suite struct { |
| 668 | @@ -48,6 +51,27 @@ | |||
| 669 | 48 | c.Assert(formatContent, gc.Equals, format_1_16) | 51 | c.Assert(formatContent, gc.Equals, format_1_16) |
| 670 | 49 | } | 52 | } |
| 671 | 50 | 53 | ||
| 672 | 54 | var configDataWithoutUpgradedToVersion = ` | ||
| 673 | 55 | tag: omg | ||
| 674 | 56 | nonce: a nonce | ||
| 675 | 57 | cacert: Y2EgY2VydA== | ||
| 676 | 58 | stateaddresses: | ||
| 677 | 59 | - localhost:1234 | ||
| 678 | 60 | apiaddresses: | ||
| 679 | 61 | - localhost:1235 | ||
| 680 | 62 | oldpassword: sekrit | ||
| 681 | 63 | values: {} | ||
| 682 | 64 | ` | ||
| 683 | 65 | |||
| 684 | 66 | func (s *format_1_16Suite) TestMissingUpgradedToVersion(c *gc.C) { | ||
| 685 | 67 | dataDir := c.MkDir() | ||
| 686 | 68 | err := ioutil.WriteFile(filepath.Join(dataDir, "agent.conf"), []byte(configDataWithoutUpgradedToVersion), 0600) | ||
| 687 | 69 | c.Assert(err, gc.IsNil) | ||
| 688 | 70 | readConfig, err := s.formatter.read(dataDir) | ||
| 689 | 71 | c.Assert(err, gc.IsNil) | ||
| 690 | 72 | c.Assert(readConfig.UpgradedToVersion(), gc.Equals, version.MustParse("1.16.0")) | ||
| 691 | 73 | } | ||
| 692 | 74 | |||
| 693 | 51 | func (s *format_1_16Suite) assertWriteAndRead(c *gc.C, config *configInternal) { | 75 | func (s *format_1_16Suite) assertWriteAndRead(c *gc.C, config *configInternal) { |
| 694 | 52 | err := s.formatter.write(config) | 76 | err := s.formatter.write(config) |
| 695 | 53 | c.Assert(err, gc.IsNil) | 77 | c.Assert(err, gc.IsNil) |
| 696 | @@ -56,7 +80,7 @@ | |||
| 697 | 56 | c.Assert(err, gc.IsNil) | 80 | c.Assert(err, gc.IsNil) |
| 698 | 57 | c.Assert(readConfig.dataDir, gc.Equals, "") | 81 | c.Assert(readConfig.dataDir, gc.Equals, "") |
| 699 | 58 | // This is put in by the ReadConf method that we are avoiding using | 82 | // This is put in by the ReadConf method that we are avoiding using |
| 701 | 59 | // becuase it will have side-effects soon around migrating configs. | 83 | // because it will have side-effects soon around migrating configs. |
| 702 | 60 | readConfig.dataDir = config.dataDir | 84 | readConfig.dataDir = config.dataDir |
| 703 | 61 | c.Assert(readConfig, gc.DeepEquals, config) | 85 | c.Assert(readConfig, gc.DeepEquals, config) |
| 704 | 62 | } | 86 | } |
| 705 | 63 | 87 | ||
| 706 | === modified file 'agent/format_whitebox_test.go' | |||
| 707 | --- agent/format_whitebox_test.go 2013-10-04 16:16:10 +0000 | |||
| 708 | +++ agent/format_whitebox_test.go 2014-02-26 03:43:42 +0000 | |||
| 709 | @@ -10,6 +10,7 @@ | |||
| 710 | 10 | gc "launchpad.net/gocheck" | 10 | gc "launchpad.net/gocheck" |
| 711 | 11 | 11 | ||
| 712 | 12 | "launchpad.net/juju-core/testing/testbase" | 12 | "launchpad.net/juju-core/testing/testbase" |
| 713 | 13 | "launchpad.net/juju-core/version" | ||
| 714 | 13 | ) | 14 | ) |
| 715 | 14 | 15 | ||
| 716 | 15 | type formatSuite struct { | 16 | type formatSuite struct { |
| 717 | @@ -21,12 +22,13 @@ | |||
| 718 | 21 | // The agentParams are used by the specific formatter whitebox tests, and is | 22 | // The agentParams are used by the specific formatter whitebox tests, and is |
| 719 | 22 | // located here for easy reuse. | 23 | // located here for easy reuse. |
| 720 | 23 | var agentParams = AgentConfigParams{ | 24 | var agentParams = AgentConfigParams{ |
| 727 | 24 | Tag: "omg", | 25 | Tag: "omg", |
| 728 | 25 | Password: "sekrit", | 26 | UpgradedToVersion: version.Current.Number, |
| 729 | 26 | CACert: []byte("ca cert"), | 27 | Password: "sekrit", |
| 730 | 27 | StateAddresses: []string{"localhost:1234"}, | 28 | CACert: []byte("ca cert"), |
| 731 | 28 | APIAddresses: []string{"localhost:1235"}, | 29 | StateAddresses: []string{"localhost:1234"}, |
| 732 | 29 | Nonce: "a nonce", | 30 | APIAddresses: []string{"localhost:1235"}, |
| 733 | 31 | Nonce: "a nonce", | ||
| 734 | 30 | } | 32 | } |
| 735 | 31 | 33 | ||
| 736 | 32 | func (*formatSuite) TestReadFormatEmptyDir(c *gc.C) { | 34 | func (*formatSuite) TestReadFormatEmptyDir(c *gc.C) { |
| 737 | 33 | 35 | ||
| 738 | === modified file 'cmd/jujud/agent_test.go' | |||
| 739 | --- cmd/jujud/agent_test.go 2014-02-20 08:23:40 +0000 | |||
| 740 | +++ cmd/jujud/agent_test.go 2014-02-26 03:43:42 +0000 | |||
| 741 | @@ -207,13 +207,14 @@ | |||
| 742 | 207 | apiInfo := s.APIInfo(c) | 207 | apiInfo := s.APIInfo(c) |
| 743 | 208 | conf, err := agent.NewAgentConfig( | 208 | conf, err := agent.NewAgentConfig( |
| 744 | 209 | agent.AgentConfigParams{ | 209 | agent.AgentConfigParams{ |
| 752 | 210 | DataDir: s.DataDir(), | 210 | DataDir: s.DataDir(), |
| 753 | 211 | Tag: tag, | 211 | Tag: tag, |
| 754 | 212 | Password: password, | 212 | UpgradedToVersion: version.Current.Number, |
| 755 | 213 | Nonce: state.BootstrapNonce, | 213 | Password: password, |
| 756 | 214 | StateAddresses: stateInfo.Addrs, | 214 | Nonce: state.BootstrapNonce, |
| 757 | 215 | APIAddresses: apiInfo.Addrs, | 215 | StateAddresses: stateInfo.Addrs, |
| 758 | 216 | CACert: stateInfo.CACert, | 216 | APIAddresses: apiInfo.Addrs, |
| 759 | 217 | CACert: stateInfo.CACert, | ||
| 760 | 217 | }) | 218 | }) |
| 761 | 218 | c.Assert(conf.Write(), gc.IsNil) | 219 | c.Assert(conf.Write(), gc.IsNil) |
| 762 | 219 | return conf, agentTools | 220 | return conf, agentTools |
| 763 | @@ -226,13 +227,14 @@ | |||
| 764 | 226 | conf, err := agent.NewStateMachineConfig( | 227 | conf, err := agent.NewStateMachineConfig( |
| 765 | 227 | agent.StateMachineConfigParams{ | 228 | agent.StateMachineConfigParams{ |
| 766 | 228 | AgentConfigParams: agent.AgentConfigParams{ | 229 | AgentConfigParams: agent.AgentConfigParams{ |
| 774 | 229 | DataDir: dataDir, | 230 | DataDir: dataDir, |
| 775 | 230 | Tag: tag, | 231 | Tag: tag, |
| 776 | 231 | Password: password, | 232 | UpgradedToVersion: version.Current.Number, |
| 777 | 232 | Nonce: state.BootstrapNonce, | 233 | Password: password, |
| 778 | 233 | StateAddresses: stateInfo.Addrs, | 234 | Nonce: state.BootstrapNonce, |
| 779 | 234 | APIAddresses: apiAddr, | 235 | StateAddresses: stateInfo.Addrs, |
| 780 | 235 | CACert: stateInfo.CACert, | 236 | APIAddresses: apiAddr, |
| 781 | 237 | CACert: stateInfo.CACert, | ||
| 782 | 236 | }, | 238 | }, |
| 783 | 237 | StateServerCert: []byte(coretesting.ServerCert), | 239 | StateServerCert: []byte(coretesting.ServerCert), |
| 784 | 238 | StateServerKey: []byte(coretesting.ServerKey), | 240 | StateServerKey: []byte(coretesting.ServerKey), |
| 785 | 239 | 241 | ||
| 786 | === modified file 'cmd/jujud/bootstrap_test.go' | |||
| 787 | --- cmd/jujud/bootstrap_test.go 2014-02-19 06:31:52 +0000 | |||
| 788 | +++ cmd/jujud/bootstrap_test.go 2014-02-26 03:43:42 +0000 | |||
| 789 | @@ -24,6 +24,7 @@ | |||
| 790 | 24 | jc "launchpad.net/juju-core/testing/checkers" | 24 | jc "launchpad.net/juju-core/testing/checkers" |
| 791 | 25 | "launchpad.net/juju-core/testing/testbase" | 25 | "launchpad.net/juju-core/testing/testbase" |
| 792 | 26 | "launchpad.net/juju-core/utils" | 26 | "launchpad.net/juju-core/utils" |
| 793 | 27 | "launchpad.net/juju-core/version" | ||
| 794 | 27 | ) | 28 | ) |
| 795 | 28 | 29 | ||
| 796 | 29 | // We don't want to use JujuConnSuite because it gives us | 30 | // We don't want to use JujuConnSuite because it gives us |
| 797 | @@ -85,13 +86,14 @@ | |||
| 798 | 85 | // NOTE: the old test used an equivalent of the NewAgentConfig, but it | 86 | // NOTE: the old test used an equivalent of the NewAgentConfig, but it |
| 799 | 86 | // really should be using NewStateMachineConfig. | 87 | // really should be using NewStateMachineConfig. |
| 800 | 87 | params := agent.AgentConfigParams{ | 88 | params := agent.AgentConfigParams{ |
| 808 | 88 | DataDir: s.dataDir, | 89 | DataDir: s.dataDir, |
| 809 | 89 | Tag: "bootstrap", | 90 | Tag: "bootstrap", |
| 810 | 90 | Password: testPasswordHash(), | 91 | UpgradedToVersion: version.Current.Number, |
| 811 | 91 | Nonce: state.BootstrapNonce, | 92 | Password: testPasswordHash(), |
| 812 | 92 | StateAddresses: []string{testing.MgoServer.Addr()}, | 93 | Nonce: state.BootstrapNonce, |
| 813 | 93 | APIAddresses: []string{"0.1.2.3:1234"}, | 94 | StateAddresses: []string{testing.MgoServer.Addr()}, |
| 814 | 94 | CACert: []byte(testing.CACert), | 95 | APIAddresses: []string{"0.1.2.3:1234"}, |
| 815 | 96 | CACert: []byte(testing.CACert), | ||
| 816 | 95 | } | 97 | } |
| 817 | 96 | bootConf, err := agent.NewAgentConfig(params) | 98 | bootConf, err := agent.NewAgentConfig(params) |
| 818 | 97 | c.Assert(err, gc.IsNil) | 99 | c.Assert(err, gc.IsNil) |
| 819 | 98 | 100 | ||
| 820 | === modified file 'environs/cloudinit/cloudinit.go' | |||
| 821 | --- environs/cloudinit/cloudinit.go 2014-02-20 15:03:08 +0000 | |||
| 822 | +++ environs/cloudinit/cloudinit.go 2014-02-26 03:43:42 +0000 | |||
| 823 | @@ -27,6 +27,7 @@ | |||
| 824 | 27 | coretools "launchpad.net/juju-core/tools" | 27 | coretools "launchpad.net/juju-core/tools" |
| 825 | 28 | "launchpad.net/juju-core/upstart" | 28 | "launchpad.net/juju-core/upstart" |
| 826 | 29 | "launchpad.net/juju-core/utils" | 29 | "launchpad.net/juju-core/utils" |
| 827 | 30 | "launchpad.net/juju-core/version" | ||
| 828 | 30 | ) | 31 | ) |
| 829 | 31 | 32 | ||
| 830 | 32 | // BootstrapStateURLFile is used to communicate to the first bootstrap node | 33 | // BootstrapStateURLFile is used to communicate to the first bootstrap node |
| 831 | @@ -436,14 +437,15 @@ | |||
| 832 | 436 | password = cfg.StateInfo.Password | 437 | password = cfg.StateInfo.Password |
| 833 | 437 | } | 438 | } |
| 834 | 438 | configParams := agent.AgentConfigParams{ | 439 | configParams := agent.AgentConfigParams{ |
| 843 | 439 | DataDir: cfg.DataDir, | 440 | DataDir: cfg.DataDir, |
| 844 | 440 | Tag: tag, | 441 | Tag: tag, |
| 845 | 441 | Password: password, | 442 | UpgradedToVersion: version.Current.Number, |
| 846 | 442 | Nonce: cfg.MachineNonce, | 443 | Password: password, |
| 847 | 443 | StateAddresses: cfg.stateHostAddrs(), | 444 | Nonce: cfg.MachineNonce, |
| 848 | 444 | APIAddresses: cfg.apiHostAddrs(), | 445 | StateAddresses: cfg.stateHostAddrs(), |
| 849 | 445 | CACert: cfg.StateInfo.CACert, | 446 | APIAddresses: cfg.apiHostAddrs(), |
| 850 | 446 | Values: cfg.AgentEnvironment, | 447 | CACert: cfg.StateInfo.CACert, |
| 851 | 448 | Values: cfg.AgentEnvironment, | ||
| 852 | 447 | } | 449 | } |
| 853 | 448 | if !cfg.StateServer { | 450 | if !cfg.StateServer { |
| 854 | 449 | return agent.NewAgentConfig(configParams) | 451 | return agent.NewAgentConfig(configParams) |
| 855 | 450 | 452 | ||
| 856 | === modified file 'juju/testing/conn.go' | |||
| 857 | --- juju/testing/conn.go 2014-02-20 04:59:31 +0000 | |||
| 858 | +++ juju/testing/conn.go 2014-02-26 03:43:42 +0000 | |||
| 859 | @@ -300,13 +300,14 @@ | |||
| 860 | 300 | c.Assert(err, gc.IsNil) | 300 | c.Assert(err, gc.IsNil) |
| 861 | 301 | config, err := agent.NewAgentConfig( | 301 | config, err := agent.NewAgentConfig( |
| 862 | 302 | agent.AgentConfigParams{ | 302 | agent.AgentConfigParams{ |
| 870 | 303 | DataDir: s.DataDir(), | 303 | DataDir: s.DataDir(), |
| 871 | 304 | Tag: tag, | 304 | Tag: tag, |
| 872 | 305 | Password: password, | 305 | UpgradedToVersion: version.Current.Number, |
| 873 | 306 | Nonce: "nonce", | 306 | Password: password, |
| 874 | 307 | StateAddresses: s.StateInfo(c).Addrs, | 307 | Nonce: "nonce", |
| 875 | 308 | APIAddresses: s.APIInfo(c).Addrs, | 308 | StateAddresses: s.StateInfo(c).Addrs, |
| 876 | 309 | CACert: []byte(testing.CACert), | 309 | APIAddresses: s.APIInfo(c).Addrs, |
| 877 | 310 | CACert: []byte(testing.CACert), | ||
| 878 | 310 | }) | 311 | }) |
| 879 | 311 | c.Assert(err, gc.IsNil) | 312 | c.Assert(err, gc.IsNil) |
| 880 | 312 | return config | 313 | return config |
| 881 | 313 | 314 | ||
| 882 | === modified file 'worker/deployer/simple.go' | |||
| 883 | --- worker/deployer/simple.go 2014-02-12 07:24:47 +0000 | |||
| 884 | +++ worker/deployer/simple.go 2014-02-26 03:43:42 +0000 | |||
| 885 | @@ -102,10 +102,11 @@ | |||
| 886 | 102 | namespace := ctx.agentConfig.Value(agent.Namespace) | 102 | namespace := ctx.agentConfig.Value(agent.Namespace) |
| 887 | 103 | conf, err := agent.NewAgentConfig( | 103 | conf, err := agent.NewAgentConfig( |
| 888 | 104 | agent.AgentConfigParams{ | 104 | agent.AgentConfigParams{ |
| 893 | 105 | DataDir: dataDir, | 105 | DataDir: dataDir, |
| 894 | 106 | Tag: tag, | 106 | Tag: tag, |
| 895 | 107 | Password: initialPassword, | 107 | UpgradedToVersion: version.Current.Number, |
| 896 | 108 | Nonce: "unused", | 108 | Password: initialPassword, |
| 897 | 109 | Nonce: "unused", | ||
| 898 | 109 | // TODO: remove the state addresses here and test when api only. | 110 | // TODO: remove the state addresses here and test when api only. |
| 899 | 110 | StateAddresses: result.StateAddresses, | 111 | StateAddresses: result.StateAddresses, |
| 900 | 111 | APIAddresses: result.APIAddresses, | 112 | APIAddresses: result.APIAddresses, |
| 901 | 112 | 113 | ||
| 902 | === modified file 'worker/provisioner/kvm-broker_test.go' | |||
| 903 | --- worker/provisioner/kvm-broker_test.go 2014-01-22 19:28:08 +0000 | |||
| 904 | +++ worker/provisioner/kvm-broker_test.go 2014-02-26 03:43:42 +0000 | |||
| 905 | @@ -66,12 +66,13 @@ | |||
| 906 | 66 | var err error | 66 | var err error |
| 907 | 67 | s.agentConfig, err = agent.NewAgentConfig( | 67 | s.agentConfig, err = agent.NewAgentConfig( |
| 908 | 68 | agent.AgentConfigParams{ | 68 | agent.AgentConfigParams{ |
| 915 | 69 | DataDir: "/not/used/here", | 69 | DataDir: "/not/used/here", |
| 916 | 70 | Tag: "tag", | 70 | Tag: "tag", |
| 917 | 71 | Password: "dummy-secret", | 71 | UpgradedToVersion: version.Current.Number, |
| 918 | 72 | Nonce: "nonce", | 72 | Password: "dummy-secret", |
| 919 | 73 | APIAddresses: []string{"10.0.0.1:1234"}, | 73 | Nonce: "nonce", |
| 920 | 74 | CACert: []byte(coretesting.CACert), | 74 | APIAddresses: []string{"10.0.0.1:1234"}, |
| 921 | 75 | CACert: []byte(coretesting.CACert), | ||
| 922 | 75 | }) | 76 | }) |
| 923 | 76 | c.Assert(err, gc.IsNil) | 77 | c.Assert(err, gc.IsNil) |
| 924 | 77 | s.broker, err = provisioner.NewKvmBroker(&fakeAPI{}, tools, s.agentConfig) | 78 | s.broker, err = provisioner.NewKvmBroker(&fakeAPI{}, tools, s.agentConfig) |
| 925 | 78 | 79 | ||
| 926 | === modified file 'worker/provisioner/lxc-broker_test.go' | |||
| 927 | --- worker/provisioner/lxc-broker_test.go 2014-02-14 11:33:57 +0000 | |||
| 928 | +++ worker/provisioner/lxc-broker_test.go 2014-02-26 03:43:42 +0000 | |||
| 929 | @@ -68,12 +68,13 @@ | |||
| 930 | 68 | var err error | 68 | var err error |
| 931 | 69 | s.agentConfig, err = agent.NewAgentConfig( | 69 | s.agentConfig, err = agent.NewAgentConfig( |
| 932 | 70 | agent.AgentConfigParams{ | 70 | agent.AgentConfigParams{ |
| 939 | 71 | DataDir: "/not/used/here", | 71 | DataDir: "/not/used/here", |
| 940 | 72 | Tag: "tag", | 72 | Tag: "tag", |
| 941 | 73 | Password: "dummy-secret", | 73 | UpgradedToVersion: version.Current.Number, |
| 942 | 74 | Nonce: "nonce", | 74 | Password: "dummy-secret", |
| 943 | 75 | APIAddresses: []string{"10.0.0.1:1234"}, | 75 | Nonce: "nonce", |
| 944 | 76 | CACert: []byte(coretesting.CACert), | 76 | APIAddresses: []string{"10.0.0.1:1234"}, |
| 945 | 77 | CACert: []byte(coretesting.CACert), | ||
| 946 | 77 | }) | 78 | }) |
| 947 | 78 | c.Assert(err, gc.IsNil) | 79 | c.Assert(err, gc.IsNil) |
| 948 | 79 | s.broker = provisioner.NewLxcBroker(&fakeAPI{}, tools, s.agentConfig) | 80 | s.broker = provisioner.NewLxcBroker(&fakeAPI{}, tools, s.agentConfig) |
Reviewers: mp+207600_
Message:
Please take a look.
Description:
Record upgradedToVersion in agent conf
The agent config files now record the version for
which upgrade steps were run. If there is no entry
in a config file, is is assumed the version is 1.16.
So there is no need for any migration, nor are there
compatibility issues. When 1.18 is deployed, the upgrade
steps are run and the config file will have 1.18 written
to it, allowing 1.20 to know that it is upgrding from
1.18 etc.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files (+332, -203 lines):
A [revision details]
M agent/agent.go
M agent/agent_test.go
M agent/bootstrap
M agent/format-
M agent/format-
M agent/format-
M agent/format_
M cmd/jujud/
M cmd/jujud/
M environs/
M juju/testing/
M worker/
M worker/
M worker/