← 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/provider/maas/environprovider_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/provider/maas/environprovider_test.go
13
13
        "github.com/juju/juju/cloud"
14
14
        "github.com/juju/juju/environs"
15
15
        "github.com/juju/juju/environs/config"
16
 
        envtesting "github.com/juju/juju/environs/testing"
17
16
        "github.com/juju/juju/testing"
18
17
)
19
18
 
47
46
        config, err := config.New(config.NoDefaults, attrs)
48
47
        c.Assert(err, jc.ErrorIsNil)
49
48
 
50
 
        ctx := envtesting.BootstrapContext(c)
51
 
        environ, err := providerInstance.PrepareForBootstrap(ctx, environs.PrepareForBootstrapParams{
 
49
        cfg, err := providerInstance.BootstrapConfig(environs.BootstrapConfigParams{
52
50
                Config:        config,
53
51
                CloudEndpoint: "http://maas.testing.invalid/maas/",
54
52
                Credentials: cloud.NewCredential(
60
58
        })
61
59
        c.Assert(err, jc.ErrorIsNil)
62
60
 
63
 
        cfg := environ.Config()
64
61
        attrs = cfg.UnknownAttrs()
65
62
        server, ok := attrs["maas-server"]
66
63
        c.Assert(ok, jc.IsTrue)
77
74
        config, err := config.New(config.NoDefaults, attrs)
78
75
        c.Assert(err, jc.ErrorIsNil)
79
76
 
80
 
        ctx := envtesting.BootstrapContext(c)
81
 
        environ, err := providerInstance.PrepareForBootstrap(ctx, environs.PrepareForBootstrapParams{
 
77
        cfg, err := providerInstance.BootstrapConfig(environs.BootstrapConfigParams{
82
78
                Config:        config,
83
79
                CloudEndpoint: "http://maas.testing.invalid/maas/",
84
80
                Credentials: cloud.NewCredential(
90
86
        })
91
87
        c.Assert(err, jc.ErrorIsNil)
92
88
 
93
 
        preparedConfig := environ.Config()
94
 
        unknownAttrs := preparedConfig.UnknownAttrs()
 
89
        unknownAttrs := cfg.UnknownAttrs()
95
90
        c.Assert(unknownAttrs["maas-server"], gc.Equals, "http://maas.testing.invalid/maas/")
96
91
 
97
92
        uuid, ok := unknownAttrs["maas-agent-name"]
 
93
 
98
94
        c.Assert(ok, jc.IsTrue)
99
95
        c.Assert(uuid, jc.Satisfies, utils.IsValidUUIDString)
100
96
}
106
102
        config, err := config.New(config.NoDefaults, attrs)
107
103
        c.Assert(err, jc.ErrorIsNil)
108
104
 
109
 
        ctx := envtesting.BootstrapContext(c)
110
 
        environ, err := providerInstance.PrepareForBootstrap(ctx, environs.PrepareForBootstrapParams{
 
105
        cfg, err := providerInstance.BootstrapConfig(environs.BootstrapConfigParams{
111
106
                Config:      config,
112
107
                CloudRegion: "maas.testing",
113
108
                Credentials: cloud.NewCredential(
119
114
        })
120
115
        c.Assert(err, jc.ErrorIsNil)
121
116
 
122
 
        preparedConfig := environ.Config()
123
 
        unknownAttrs := preparedConfig.UnknownAttrs()
 
117
        unknownAttrs := cfg.UnknownAttrs()
124
118
        c.Assert(unknownAttrs["maas-server"], gc.Equals, "http://maas.testing/MAAS")
125
119
}
126
120
 
163
157
        config, err := config.New(config.NoDefaults, attrs)
164
158
        c.Assert(err, jc.ErrorIsNil)
165
159
 
166
 
        ctx := envtesting.BootstrapContext(c)
167
 
        _, err = providerInstance.PrepareForBootstrap(ctx, environs.PrepareForBootstrapParams{
 
160
        _, err = providerInstance.BootstrapConfig(environs.BootstrapConfigParams{
168
161
                Config:        config,
169
162
                CloudEndpoint: "http://maas.testing.invalid/maas/",
170
163
                Credentials: cloud.NewCredential(