← 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/cmd/juju/controller/addmodel_test.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/cmd/juju/controller/addmodel_test.go
13
13
        jc "github.com/juju/testing/checkers"
14
14
        "github.com/juju/utils"
15
15
        gc "gopkg.in/check.v1"
 
16
        "gopkg.in/juju/names.v2"
16
17
        "gopkg.in/yaml.v2"
17
18
 
18
19
        "github.com/juju/juju/api"
 
20
        "github.com/juju/juju/api/base"
19
21
        "github.com/juju/juju/apiserver/params"
20
22
        "github.com/juju/juju/cloud"
21
23
        "github.com/juju/juju/cmd/juju/controller"
23
25
        "github.com/juju/juju/jujuclient/jujuclienttesting"
24
26
        _ "github.com/juju/juju/provider/ec2"
25
27
        "github.com/juju/juju/testing"
26
 
        "gopkg.in/juju/names.v2"
27
28
)
28
29
 
29
30
type AddModelSuite struct {
38
39
func (s *AddModelSuite) SetUpTest(c *gc.C) {
39
40
        s.FakeJujuXDGDataHomeSuite.SetUpTest(c)
40
41
        s.fakeAddModelAPI = &fakeAddClient{
41
 
                model: params.ModelInfo{
42
 
                        Name:     "test",
43
 
                        UUID:     "fake-model-uuid",
44
 
                        OwnerTag: "ignored-for-now",
 
42
                model: base.ModelInfo{
 
43
                        Name:  "test",
 
44
                        UUID:  "fake-model-uuid",
 
45
                        Owner: "ignored-for-now",
45
46
                },
46
47
        }
47
48
        s.fakeCloudAPI = &fakeCloudAPI{}
182
183
        c.Assert(s.fakeAddModelAPI.cloudCredential, gc.Equals, names.NewCloudCredentialTag("aws/other/secrets"))
183
184
}
184
185
 
 
186
func (s *AddModelSuite) TestCredentialsOtherUserPassedThroughWhenCloud(c *gc.C) {
 
187
        _, err := s.run(c, "test", "--credential", "other/secrets", "aws/us-west-1")
 
188
        c.Assert(err, jc.ErrorIsNil)
 
189
 
 
190
        c.Assert(s.fakeAddModelAPI.cloudCredential, gc.Equals, names.NewCloudCredentialTag("aws/other/secrets"))
 
191
}
 
192
 
185
193
func (s *AddModelSuite) TestCredentialsNoDefaultCloud(c *gc.C) {
186
194
        s.fakeCloudAPI.SetErrors(&params.Error{Code: params.CodeNotFound})
187
195
        _, err := s.run(c, "test", "--credential", "secrets")
401
409
        cloudCredential names.CloudCredentialTag
402
410
        config          map[string]interface{}
403
411
        err             error
404
 
        model           params.ModelInfo
 
412
        model           base.ModelInfo
405
413
}
406
414
 
407
415
var _ controller.AddModelAPI = (*fakeAddClient)(nil)
410
418
        return nil
411
419
}
412
420
 
413
 
func (f *fakeAddClient) CreateModel(name, owner, cloudName, cloudRegion string, cloudCredential names.CloudCredentialTag, config map[string]interface{}) (params.ModelInfo, error) {
 
421
func (f *fakeAddClient) CreateModel(name, owner, cloudName, cloudRegion string, cloudCredential names.CloudCredentialTag, config map[string]interface{}) (base.ModelInfo, error) {
414
422
        if f.err != nil {
415
 
                return params.ModelInfo{}, f.err
 
423
                return base.ModelInfo{}, f.err
416
424
        }
417
425
        f.owner = owner
418
426
        f.cloudCredential = cloudCredential