← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/testing/factory/factory.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/testing/factory/factory.go
19
19
        "gopkg.in/juju/names.v2"
20
20
 
21
21
        "github.com/juju/juju/constraints"
22
 
        "github.com/juju/juju/core/description"
23
22
        "github.com/juju/juju/instance"
24
23
        "github.com/juju/juju/network"
 
24
        "github.com/juju/juju/permission"
25
25
        "github.com/juju/juju/state"
26
26
        "github.com/juju/juju/status"
27
27
        "github.com/juju/juju/storage"
54
54
        Creator     names.Tag
55
55
        NoModelUser bool
56
56
        Disabled    bool
57
 
        Access      description.Access
 
57
        Access      permission.Access
58
58
}
59
59
 
60
60
// ModelUserParams defines the parameters for creating an environment user.
62
62
        User        string
63
63
        DisplayName string
64
64
        CreatedBy   names.Tag
65
 
        Access      description.Access
 
65
        Access      permission.Access
66
66
}
67
67
 
68
68
// CharmParams defines the parameters for creating a charm.
181
181
                c.Assert(err, jc.ErrorIsNil)
182
182
                params.Creator = env.Owner()
183
183
        }
184
 
        if params.Access == description.UndefinedAccess {
185
 
                params.Access = description.AdminAccess
 
184
        if params.Access == permission.UndefinedAccess {
 
185
                params.Access = permission.AdminAccess
186
186
        }
187
187
        creatorUserTag := params.Creator.(names.UserTag)
188
188
        user, err := factory.st.AddUser(
208
208
// attributes of ModelUserParams that are the default empty values, some
209
209
// meaningful valid values are used instead. If params is not specified,
210
210
// defaults are used.
211
 
func (factory *Factory) MakeModelUser(c *gc.C, params *ModelUserParams) description.UserAccess {
 
211
func (factory *Factory) MakeModelUser(c *gc.C, params *ModelUserParams) permission.UserAccess {
212
212
        if params == nil {
213
213
                params = &ModelUserParams{}
214
214
        }
219
219
        if params.DisplayName == "" {
220
220
                params.DisplayName = uniqueString("display name")
221
221
        }
222
 
        if params.Access == description.UndefinedAccess {
223
 
                params.Access = description.AdminAccess
 
222
        if params.Access == permission.UndefinedAccess {
 
223
                params.Access = permission.AdminAccess
224
224
        }
225
225
        if params.CreatedBy == nil {
226
226
                env, err := factory.st.Model()