state: match subordinate relation series

state: match subordinate relation series

This errors on AddRelation, but not on InferEndpoints, because it's tricky
to do it at that stage. This shouldn't have any serious impact.

https://code.launchpad.net/~fwereade/juju-core/state-subordinate-series/+merge/156153

Requires: https://code.launchpad.net/~fwereade/juju-core/state-subordinate-constraints/+merge/156138

(do not edit description out of merge proposal)

[fwereade, 2013-03-29 13:05:03]

Please take a look.

[dimitern, 2013-03-29 15:11:59]

LGTM

https://codereview.appspot.com/8154043/diff/1/state/state.go
File state/state.go (right):

https://codereview.appspot.com/8154043/diff/1/state/state.go#newcode689
state/state.go:689: // services's series must also match, because they'll be
deployed to
This is a good thing to add to the doc/drafts as well.

[fwereade, 2013-03-30 05:09:51]

https://codereview.appspot.com/8154043/diff/1/state/state.go
File state/state.go (right):

https://codereview.appspot.com/8154043/diff/1/state/state.go#newcode689
state/state.go:689: // services's series must also match, because they'll be
deployed to
On 2013/03/29 15:11:59, dimitern wrote:
> This is a good thing to add to the doc/drafts as well.

I've added a card for that in kanban, assigned to myself.

[jameinel, 2013-04-01 07:21:45]

LGTM

https://codereview.appspot.com/8154043/diff/1/state/relation_test.go
File state/relation_test.go (right):

https://codereview.appspot.com/8154043/diff/1/state/relation_test.go#newcode159
state/relation_test.go:159: mysql, err := s.State.AddService("mysql",
s.AddSeriesCharm(c, "mysql", "otherseries", 123))
Is it worth adding a test of some sort of:

c.Assert(mysql.Series, Not(Equal), wordpress.Series)

I don't know exactly how to state it, but in case "otherseries" ends up ignored,
or something like that.

[fwereade, 2013-04-01 10:52:49]

*** Submitted:

state: match subordinate relation series

This errors on AddRelation, but not on InferEndpoints, because it's tricky
to do it at that stage. This shouldn't have any serious impact.

R=dimitern, jameinel
CC=
https://codereview.appspot.com/8154043

https://codereview.appspot.com/8154043/diff/1/state/relation_test.go
File state/relation_test.go (right):

https://codereview.appspot.com/8154043/diff/1/state/relation_test.go#newcode159
state/relation_test.go:159: mysql, err := s.State.AddService("mysql",
s.AddSeriesCharm(c, "mysql", "otherseries", 123))
On 2013/04/01 07:21:45, jameinel wrote:
> Is it worth adding a test of some sort of:
> 
> c.Assert(mysql.Series, Not(Equal), wordpress.Series)
> 
> I don't know exactly how to state it, but in case "otherseries" ends up
ignored,
> or something like that.

Hmm... I think that's better addressed with explicit tests for the test helpers.
Good thought, though, thank you.