state: embed charm.Relation in Endpoint.

state: embed charm.Relation in Endpoint.

We add the relation name and role to charm.Relation.
This makes it reasonable to use Relation in the API
interface for endpoints.

https://code.launchpad.net/~rogpeppe/juju-core/259-charm-relation-name/+merge/155801

(do not edit description out of merge proposal)

[rog, 2013-03-27 17:28:21]

Please take a look.

[dimitern, 2013-03-27 17:58:02]

Nice and more logical, LGTM.

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go
File charm/meta.go (right):

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go#newcode215
charm/meta.go:215: Name:      name,
nice!

https://codereview.appspot.com/8055044/diff/2001/charm/meta_test.go
File charm/meta_test.go (right):

https://codereview.appspot.com/8055044/diff/2001/charm/meta_test.go#newcode237
charm/meta_test.go:237: func (s *MetaSuite) TestCheckMismatchedRelationName(c
*C) {
Good to have these 2 tests, I was wondering before why we don't have them.

[fwereade, 2013-03-28 09:26:01]

LGTM modulo remarks below; very nice. Thanks.

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go
File charm/meta.go (right):

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go#newcode26
charm/meta.go:26: // RelationRole defines the role of a relation endpoint.
s/ endpoint//

Let's keep that terminology out of charm, I think it's only meaningful at
runtime.

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go#newcode197
charm/meta.go:197: return fmt.Errorf("subordinate charm %q lacks requires
relation with container scope", meta.Name)
Just a thought, since you're here, maybe quote "requires"

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go#newcode218
charm/meta.go:218: Optional:  relMap["optional"].(bool),
Not sure what the distinction is between Limit and Optional -- they're equally
ignored AFAICT, so we should probably include both or neither.

https://codereview.appspot.com/8055044/diff/2001/state/state.go
File state/state.go (right):

https://codereview.appspot.com/8055044/diff/2001/state/state.go#newcode428
state/state.go:428: return nil, fmt.Errorf("malformed charm metadata found in
state: %v", err)
Good check, thank you.

[rog, 2013-03-28 11:56:22]

*** Submitted:

state: embed charm.Relation in Endpoint.

We add the relation name and role to charm.Relation.
This makes it reasonable to use Relation in the API
interface for endpoints.

R=
CC=
https://codereview.appspot.com/8055044

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go
File charm/meta.go (right):

https://codereview.appspot.com/8055044/diff/2001/charm/meta.go#newcode218
charm/meta.go:218: Optional:  relMap["optional"].(bool),
On 2013/03/28 09:26:02, fwereade wrote:
> Not sure what the distinction is between Limit and Optional -- they're equally
> ignored AFAICT, so we should probably include both or neither.

we do include both (see below)