← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/worker/uniter/runner/jujuc/relation_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/worker/uniter/runner/jujuc/relation_test.go
8
8
 
9
9
        "github.com/juju/testing"
10
10
 
11
 
        "github.com/juju/juju/apiserver/params"
12
11
        "github.com/juju/juju/worker/uniter/runner/jujuc"
13
12
        jujuctesting "github.com/juju/juju/worker/uniter/runner/jujuc/testing"
14
13
)
23
22
        settings := jujuctesting.Settings{
24
23
                "private-address": "u-0.testing.invalid",
25
24
        }
26
 
        rInfo.setNextRelation("", s.Unit, settings, nil) // peer0
27
 
        rInfo.setNextRelation("", s.Unit, settings, nil) // peer1
 
25
        rInfo.setNextRelation("", s.Unit, settings) // peer0
 
26
        rInfo.setNextRelation("", s.Unit, settings) // peer1
28
27
        if relid >= 0 {
29
28
                rInfo.SetAsRelationHook(relid, remote)
30
29
        }
45
44
        ri.rels = nil
46
45
}
47
46
 
48
 
func (ri *relationInfo) setNextRelation(
49
 
        name, unit string,
50
 
        settings jujuctesting.Settings,
51
 
        netConfig []params.NetworkConfig,
52
 
) int {
 
47
func (ri *relationInfo) setNextRelation(name, unit string, settings jujuctesting.Settings) int {
53
48
        if ri.rels == nil {
54
49
                ri.rels = make(map[int]*jujuctesting.Relation)
55
50
        }
60
55
        relation := ri.SetNewRelation(id, name, ri.stub)
61
56
        if unit != "" {
62
57
                relation.UnitName = unit
63
 
                relation.SetRelated(unit, settings, netConfig)
 
58
                relation.SetRelated(unit, settings)
64
59
        }
65
60
        ri.rels[id] = relation
66
61
        return id
67
62
}
68
63
 
69
 
func (ri *relationInfo) addRelatedServices(relname string, count int, netConfig []params.NetworkConfig) {
 
64
func (ri *relationInfo) addRelatedServices(relname string, count int) {
70
65
        if ri.rels == nil {
71
66
                ri.rels = make(map[int]*jujuctesting.Relation)
72
67
        }
73
68
        for i := 0; i < count; i++ {
74
 
                ri.setNextRelation(relname, "", nil, netConfig)
 
69
                ri.setNextRelation(relname, "", nil)
75
70
        }
76
71
}
77
72
 
78
 
func (ri *relationInfo) setRelations(id int, members []string, netConfig []params.NetworkConfig) {
 
73
func (ri *relationInfo) setRelations(id int, members []string) {
79
74
        relation := ri.rels[id]
80
75
        relation.Reset()
81
76
        for _, name := range members {
82
 
                relation.SetRelated(name, nil, netConfig)
 
77
                relation.SetRelated(name, nil)
83
78
        }
84
79
}