Merge lp://staging/~gary/juju-core/more-info into lp://staging/~juju/juju-core/trunk

Proposed by Gary Poster
Status: Merged
Approved by: William Reade
Approved revision: no longer in the source branch.
Merged at revision: 1089
Proposed branch: lp://staging/~gary/juju-core/more-info
Merge into: lp://staging/~juju/juju-core/trunk
Diff against target: 2502 lines (+407/-341)
29 files modified
cmd/builddb/main.go (+4/-3)
cmd/juju/resolved_test.go (+9/-9)
cmd/juju/status.go (+4/-3)
cmd/juju/status_test.go (+4/-3)
cmd/jujud/unit_test.go (+4/-3)
environs/dummy/environs.go (+13/-12)
environs/ec2/ec2.go (+12/-11)
environs/interface.go (+7/-6)
environs/jujutest/livetests.go (+25/-24)
environs/openstack/provider.go (+11/-10)
juju/conn.go (+3/-3)
juju/conn_test.go (+4/-3)
state/api/params/params.go (+43/-2)
state/api/params/params_test.go (+21/-1)
state/apiserver/api_test.go (+2/-2)
state/machine_test.go (+5/-4)
state/megawatcher_internal_test.go (+21/-5)
state/service.go (+2/-1)
state/state_test.go (+5/-4)
state/statecmd/resolved.go (+3/-3)
state/statecmd/resolved_test.go (+4/-4)
state/unit.go (+20/-51)
state/unit_test.go (+49/-48)
worker/firewaller/firewaller.go (+18/-17)
worker/firewaller/firewaller_test.go (+35/-34)
worker/uniter/filter.go (+9/-8)
worker/uniter/filter_test.go (+8/-7)
worker/uniter/modes.go (+8/-7)
worker/uniter/uniter_test.go (+54/-53)
To merge this branch: bzr merge lp://staging/~gary/juju-core/more-info
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+156406@code.staging.launchpad.net

Description of the change

Expose more delta information

This exposes more unit attributes to the watchers. The only true additions in this branch are to the params.go file, and the associated test. After this change, much more (but unfortunately still not all) of the values we need will be exposed in the watcher.

The branch is very large because of mechanical changes that prevent circular imports. UnitStatus, Port, and ResolvedMode needed to move into the params package, and this required a very large number of mechanical import changes. The rest of the changes in this branch, other than some test fix-ups in megawatcher_internal_test.go, are just these mechanical changes to handle the new location.

https://codereview.appspot.com/8086045/

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Reviewers: mp+156406_code.launchpad.net,

Message:
Please take a look.

Description:
Expose more delta information

This exposes more unit attributes to the watchers. The only true
additions in this branch are to the params.go file, and the associated
test. After this change, much more (but unfortunately still not all) of
the values we need will be exposed in the watcher.

The branch is very large because of mechanical changes that prevent
circular imports. UnitStatus, Port, and ResolvedMode needed to move
into the params package, and this required a very large number of
mechanical import changes. The rest of the changes in this branch,
other than some test fix-ups in megawatcher_internal_test.go, are just
these mechanical changes to handle the new location.

https://code.launchpad.net/~gary/juju-core/more-info/+merge/156406

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8086045/

Affected files:
   A [revision details]
   M cmd/builddb/main.go
   M cmd/juju/resolved_test.go
   M cmd/juju/status.go
   M cmd/juju/status_test.go
   M cmd/jujud/unit_test.go
   M environs/dummy/environs.go
   M environs/ec2/ec2.go
   M environs/interface.go
   M environs/jujutest/livetests.go
   M environs/openstack/provider.go
   M juju/conn.go
   M juju/conn_test.go
   M state/api/params/params.go
   M state/api/params/params_test.go
   M state/apiserver/api_test.go
   M state/machine_test.go
   M state/megawatcher_internal_test.go
   M state/service.go
   M state/state_test.go
   M state/statecmd/resolved.go
   M state/statecmd/resolved_test.go
   M state/unit.go
   M state/unit_test.go
   M worker/firewaller/firewaller.go
   M worker/firewaller/firewaller_test.go
   M worker/uniter/filter.go
   M worker/uniter/filter_test.go
   M worker/uniter/modes.go
   M worker/uniter/uniter_test.go

Revision history for this message
Tim Penhey (thumper) wrote :

LGTM modulo the comment below

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go
File state/api/params/params_test.go (right):

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go#newcode55
state/api/params/params_test.go:55: Series: "series", // E.g. precise.
Can we change the test so instead of using comments for "precise" and
"wordpress" we instead have the test output show this?

https://codereview.appspot.com/8086045/

Revision history for this message
William Reade (fwereade) wrote :

LGTM -- maybe ping me tomorrow about status and status info?

https://codereview.appspot.com/8086045/diff/1/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/8086045/diff/1/state/api/params/params.go#newcode340
state/api/params/params.go:340: StatusInfo string
Hmm, there may be some changes to status landing shortly. How bad would
it be for you if statuses were to move off the unit document and into
their own collection? I guess it'd be more megawatcher work, but I guess
there may be further consequences on your side?

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go
File state/api/params/params_test.go (right):

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go#newcode55
state/api/params/params_test.go:55: Series: "series", // E.g. precise.
On 2013/04/01 20:46:58, thumper wrote:
> Can we change the test so instead of using comments for "precise" and
> "wordpress" we instead have the test output show this?

+1

https://codereview.appspot.com/8086045/

Revision history for this message
Gary Poster (gary) wrote :

*** Submitted:

Expose more delta information

This exposes more unit attributes to the watchers. The only true
additions in this branch are to the params.go file, and the associated
test. After this change, much more (but unfortunately still not all) of
the values we need will be exposed in the watcher.

The branch is very large because of mechanical changes that prevent
circular imports. UnitStatus, Port, and ResolvedMode needed to move
into the params package, and this required a very large number of
mechanical import changes. The rest of the changes in this branch,
other than some test fix-ups in megawatcher_internal_test.go, are just
these mechanical changes to handle the new location.

R=thumper, fwereade
CC=
https://codereview.appspot.com/8086045

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go
File state/api/params/params_test.go (right):

https://codereview.appspot.com/8086045/diff/1/state/api/params/params_test.go#newcode55
state/api/params/params_test.go:55: Series: "series", // E.g. precise.
On 2013/04/01 20:46:58, thumper wrote:
> Can we change the test so instead of using comments for "precise" and
> "wordpress" we instead have the test output show this?

Done.

https://codereview.appspot.com/8086045/

Revision history for this message
Gary Poster (gary) wrote :

Thank you both very much for the prompt review.

On 2013/04/01 22:52:58, fwereade wrote:
> LGTM -- maybe ping me tomorrow about status and status info?

OK, will do.

Short answer is that, if we were not under time pressure, I would have
zero concerns. With the time pressure, and the fact that I realized
last Friday that we are also already going to need to add separate
watchers for config and constraint docs, I'm a lot more nervous about
the change. If we could postpone the change to post 13.04 that would be
fabulous. If we can't, we'll just need to strategize, and see how
quickly Roger and we can whip up the necessary code on the GUI/API side.

https://codereview.appspot.com/8086045/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches