Skip to content

Commit 332c590

Browse files
author
externalreality
committed
Move UpdateModelConfig to state.Model receiver.
1 parent 77aab72 commit 332c590

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+93
-78
lines changed

‎api/keymanager/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (s *keymanagerSuite) SetUpTest(c *gc.C) {
3636
}
3737

3838
func (s *keymanagerSuite) setAuthorisedKeys(c *gc.C, keys string) {
39-
err := s.BackingState.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
39+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
4040
c.Assert(err, jc.ErrorIsNil)
4141
}
4242

‎api/keyupdater/authorisedkeys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (s *keyupdaterSuite) TestAuthorisedKeys(c *gc.C) {
5656
}
5757

5858
func (s *keyupdaterSuite) setAuthorisedKeys(c *gc.C, keys string) {
59-
err := s.BackingState.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
59+
err := s.Model.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
6060
c.Assert(err, jc.ErrorIsNil)
6161
}
6262

‎api/logger/logger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (s *loggerSuite) TestLoggingConfig(c *gc.C) {
5252
}
5353

5454
func (s *loggerSuite) setLoggingConfig(c *gc.C, loggingConfig string) {
55-
err := s.BackingState.UpdateModelConfig(map[string]interface{}{"logging-config": loggingConfig}, nil)
55+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"logging-config": loggingConfig}, nil)
5656
c.Assert(err, jc.ErrorIsNil)
5757
}
5858

‎api/testing/environwatcher.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@ func (s *ModelWatcherTests) TestWatchForModelConfigChanges(c *gc.C) {
6060

6161
// Change the model configuration by updating an existing attribute, check it's detected.
6262
newAttrs := map[string]interface{}{"logging-config": "juju=ERROR"}
63-
err = s.state.UpdateModelConfig(newAttrs, nil)
63+
err = s.model.UpdateModelConfig(newAttrs, nil)
6464
c.Assert(err, jc.ErrorIsNil)
6565
wc.AssertOneChange()
6666

6767
// Change the model configuration by adding a new attribute, check it's detected.
6868
newAttrs = map[string]interface{}{"foo": "bar"}
69-
err = s.state.UpdateModelConfig(newAttrs, nil)
69+
err = s.model.UpdateModelConfig(newAttrs, nil)
7070
c.Assert(err, jc.ErrorIsNil)
7171
wc.AssertOneChange()
7272

7373
// Change the model configuration by removing an attribute, check it's detected.
74-
err = s.state.UpdateModelConfig(map[string]interface{}{}, []string{"foo"})
74+
err = s.model.UpdateModelConfig(map[string]interface{}{}, []string{"foo"})
7575
c.Assert(err, jc.ErrorIsNil)
7676
wc.AssertOneChange()
7777

7878
// Change it back to the original config.
7979
oldAttrs := map[string]interface{}{"logging-config": envConfig.AllAttrs()["logging-config"]}
80-
err = s.state.UpdateModelConfig(oldAttrs, nil)
80+
err = s.model.UpdateModelConfig(oldAttrs, nil)
8181
c.Assert(err, jc.ErrorIsNil)
8282
wc.AssertOneChange()
8383
}

‎apiserver/facades/agent/keyupdater/authorisedkeys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (s *authorisedKeysSuite) TestWatchAuthorisedKeysNothing(c *gc.C) {
7373
}
7474

7575
func (s *authorisedKeysSuite) setAuthorizedKeys(c *gc.C, keys string) {
76-
err := s.State.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
76+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
7777
c.Assert(err, jc.ErrorIsNil)
7878
envConfig, err := s.IAASModel.ModelConfig()
7979
c.Assert(err, jc.ErrorIsNil)

‎apiserver/facades/agent/logger/logger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (s *loggerSuite) TestWatchLoggingConfigNothing(c *gc.C) {
7373
}
7474

7575
func (s *loggerSuite) setLoggingConfig(c *gc.C, loggingConfig string) {
76-
err := s.State.UpdateModelConfig(map[string]interface{}{"logging-config": loggingConfig}, nil)
76+
err := s.Model.UpdateModelConfig(map[string]interface{}{"logging-config": loggingConfig}, nil)
7777
c.Assert(err, jc.ErrorIsNil)
7878
envConfig, err := s.IAASModel.ModelConfig()
7979
c.Assert(err, jc.ErrorIsNil)

‎apiserver/facades/agent/provisioner/provisioner_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ func (s *withoutControllerSuite) TestSetInstanceInfo(c *gc.C) {
11641164
})
11651165
_, err := pm.Create("static-pool", "static", map[string]interface{}{"foo": "bar"})
11661166
c.Assert(err, jc.ErrorIsNil)
1167-
err = s.State.UpdateModelConfig(map[string]interface{}{
1167+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{
11681168
"storage-default-block-source": "static-pool",
11691169
}, nil)
11701170
c.Assert(err, jc.ErrorIsNil)
@@ -1356,7 +1356,7 @@ func (s *withoutControllerSuite) TestContainerConfig(c *gc.C) {
13561356
"allow-lxd-loop-mounts": true,
13571357
"apt-mirror": "http://example.mirror.com",
13581358
}
1359-
err := s.State.UpdateModelConfig(attrs, nil)
1359+
err := s.Model.UpdateModelConfig(attrs, nil)
13601360
c.Assert(err, jc.ErrorIsNil)
13611361
expectedAPTProxy := proxy.Settings{
13621362
Http: "http://proxy.example.com:9000",

‎apiserver/facades/agent/retrystrategy/retrystrategy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (s *retryStrategySuite) TestRetryStrategy(c *gc.C) {
119119
}
120120

121121
func (s *retryStrategySuite) setRetryStrategy(c *gc.C, automaticallyRetryHooks bool) {
122-
err := s.State.UpdateModelConfig(map[string]interface{}{"automatically-retry-hooks": automaticallyRetryHooks}, nil)
122+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"automatically-retry-hooks": automaticallyRetryHooks}, nil)
123123
c.Assert(err, jc.ErrorIsNil)
124124
envConfig, err := s.IAASModel.ModelConfig()
125125
c.Assert(err, jc.ErrorIsNil)

‎apiserver/facades/agent/uniter/uniter_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ func (s *uniterSuite) TestNetworkInfoSpaceless(c *gc.C) {
515515
err := s.machine0.SetProviderAddresses(
516516
network.NewScopedAddress("1.2.3.4", network.ScopeCloudLocal),
517517
)
518-
err = s.State.UpdateModelConfig(map[string]interface{}{config.EgressSubnets: "10.0.0.0/8"}, nil)
518+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{config.EgressSubnets: "10.0.0.0/8"}, nil)
519519
c.Assert(err, jc.ErrorIsNil)
520520

521521
args := params.NetworkInfoParams{
@@ -2794,7 +2794,7 @@ func (s *uniterSuite) TestRelationEgressSubnets(c *gc.C) {
27942794
relTag, relUnit := s.setupRemoteRelationScenario(c)
27952795

27962796
// Check model attributes are overridden by setting up a value.
2797-
err := s.State.UpdateModelConfig(map[string]interface{}{"egress-subnets": "192.168.0.0/16"}, nil)
2797+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"egress-subnets": "192.168.0.0/16"}, nil)
27982798
c.Assert(err, jc.ErrorIsNil)
27992799
egress := state.NewRelationEgressNetworks(s.State)
28002800
_, err = egress.Save(relTag.Id(), false, []string{"10.0.0.0/16", "10.1.2.0/8"})
@@ -2824,7 +2824,7 @@ func (s *uniterSuite) TestRelationEgressSubnets(c *gc.C) {
28242824
func (s *uniterSuite) TestModelEgressSubnets(c *gc.C) {
28252825
relTag, relUnit := s.setupRemoteRelationScenario(c)
28262826

2827-
err := s.State.UpdateModelConfig(map[string]interface{}{"egress-subnets": "192.168.0.0/16"}, nil)
2827+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"egress-subnets": "192.168.0.0/16"}, nil)
28282828
c.Assert(err, jc.ErrorIsNil)
28292829

28302830
thisUniter := s.makeMysqlUniter(c)
@@ -3802,7 +3802,7 @@ func (s *uniterNetworkInfoSuite) TestNetworkInfoUsesRelationAddress(c *gc.C) {
38023802
s.base.assertInScope(c, mysqlRelUnit, true)
38033803

38043804
// Relation specific egress subnets override model config.
3805-
err = s.base.State.UpdateModelConfig(map[string]interface{}{config.EgressSubnets: "10.0.0.0/8"}, nil)
3805+
err = s.base.JujuConnSuite.IAASModel.UpdateModelConfig(map[string]interface{}{config.EgressSubnets: "10.0.0.0/8"}, nil)
38063806
c.Assert(err, jc.ErrorIsNil)
38073807
relEgress := state.NewRelationEgressNetworks(s.base.State)
38083808
_, err = relEgress.Save(rel.Tag().Id(), false, []string{"192.168.1.0/24"})

‎apiserver/facades/client/application/application_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ func (s *applicationSuite) TestSpecializeStoreOnDeployApplicationSetCharmAndAddC
10961096
return repo
10971097
})
10981098
attrs := map[string]interface{}{"test-mode": true}
1099-
err := s.State.UpdateModelConfig(attrs, nil)
1099+
err := s.IAASModel.UpdateModelConfig(attrs, nil)
11001100
c.Assert(err, jc.ErrorIsNil)
11011101

11021102
// Check that the store's test mode is enabled when calling application Deploy.

‎apiserver/facades/client/client/api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func (s *baseSuite) setUpScenario(c *gc.C) (entities []names.Tag) {
372372
c.Assert(err, jc.ErrorIsNil)
373373
setDefaultPassword(c, u)
374374
add(u)
375-
err = s.State.UpdateModelConfig(map[string]interface{}{
375+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{
376376
config.AgentVersionKey: "1.2.3"}, nil)
377377
c.Assert(err, jc.ErrorIsNil)
378378

‎apiserver/facades/client/client/backend.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ type stateShim struct {
9696
model *state.Model
9797
}
9898

99+
func (st stateShim) UpdateModelConfig(u map[string]interface{}, r []string, a ...state.ValidateConfigFunc) error {
100+
return st.model.UpdateModelConfig(u, r, a...)
101+
}
102+
99103
func (st stateShim) ModelConfigValues() (config.ConfigValues, error) {
100104
return st.model.ModelConfigValues()
101105
}

‎apiserver/facades/client/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ func (s *clientSuite) TestProvisioningScriptDisablePackageCommands(c *gc.C) {
12581258
}
12591259

12601260
setUpdateBehavior := func(update, upgrade bool) {
1261-
s.State.UpdateModelConfig(
1261+
s.IAASModel.UpdateModelConfig(
12621262
map[string]interface{}{
12631263
"enable-os-upgrade": upgrade,
12641264
"enable-os-refresh-update": update,

‎apiserver/facades/client/keymanager/keymanager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (api *KeyManagerAPI) writeSSHKeys(sshKeys []string) error {
173173
// TODO(waigani) 2014-03-17 bug #1293324
174174
// Pass in validation to ensure SSH keys
175175
// have not changed underfoot
176-
err := api.state.UpdateModelConfig(attrs, nil)
176+
err := api.model.UpdateModelConfig(attrs, nil)
177177
if err != nil {
178178
return fmt.Errorf("writing environ config: %v", err)
179179
}

‎apiserver/facades/client/keymanager/keymanager_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ func (s *keyManagerSuite) setAuthorisedKeys(c *gc.C, keys string) {
8585
}
8686

8787
func (s *keyManagerSuite) setAuthorisedKeysForModel(c *gc.C, st *state.State, keys string) {
88-
err := st.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
88+
m, err := st.Model()
8989
c.Assert(err, jc.ErrorIsNil)
9090

91-
m, err := st.Model()
91+
err = m.UpdateModelConfig(map[string]interface{}{"authorized-keys": keys}, nil)
9292
c.Assert(err, jc.ErrorIsNil)
9393

9494
modelConfig, err := m.ModelConfig()

‎apiserver/facades/client/modelconfig/backend.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ type stateShim struct {
2828
model *state.Model
2929
}
3030

31+
func (st stateShim) UpdateModelConfig(u map[string]interface{}, r []string, a ...state.ValidateConfigFunc) error {
32+
return st.model.UpdateModelConfig(u, r, a...)
33+
}
34+
3135
func (st stateShim) ModelConfigValues() (config.ConfigValues, error) {
3236
return st.model.ModelConfigValues()
3337
}

‎cmd/juju/application/deploy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func (s *DeploySuite) TestDeployFromPathOldCharm(c *gc.C) {
176176
func (s *DeploySuite) TestDeployFromPathOldCharmMissingSeries(c *gc.C) {
177177
// Update the model default series to be unset.
178178
updateAttrs := map[string]interface{}{"default-series": ""}
179-
err := s.State.UpdateModelConfig(updateAttrs, nil)
179+
err := s.IAASModel.UpdateModelConfig(updateAttrs, nil)
180180
c.Assert(err, jc.ErrorIsNil)
181181

182182
path := testcharms.Repo.ClonedDirPath(s.CharmsPath, "dummy")
@@ -197,7 +197,7 @@ func (s *DeploySuite) TestDeployFromPathDefaultSeries(c *gc.C) {
197197
// and yet, here, the model defaults to the series "trusty". This test
198198
// asserts that the model's default takes precedence.
199199
updateAttrs := map[string]interface{}{"default-series": "trusty"}
200-
err := s.State.UpdateModelConfig(updateAttrs, nil)
200+
err := s.IAASModel.UpdateModelConfig(updateAttrs, nil)
201201
c.Assert(err, jc.ErrorIsNil)
202202
path := testcharms.Repo.ClonedDirPath(s.CharmsPath, "multi-series")
203203
_, err = runDeploy(c, path)

‎cmd/juju/commands/ssh_unix_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (s *SSHSuite) TestSSHCommandModelConfigProxySSH(c *gc.C) {
195195
s.setupModel(c)
196196

197197
// Setting proxy-ssh=true in the environment overrides --proxy.
198-
err := s.State.UpdateModelConfig(map[string]interface{}{"proxy-ssh": true}, nil)
198+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"proxy-ssh": true}, nil)
199199
c.Assert(err, jc.ErrorIsNil)
200200

201201
s.setForceAPIv1(true)

‎cmd/juju/commands/sshkeys_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (s *keySuiteBase) SetUpTest(c *gc.C) {
7070

7171
func (s *keySuiteBase) setAuthorizedKeys(c *gc.C, keys ...string) {
7272
keyString := strings.Join(keys, "\n")
73-
err := s.State.UpdateModelConfig(map[string]interface{}{"authorized-keys": keyString}, nil)
73+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"authorized-keys": keyString}, nil)
7474
c.Assert(err, jc.ErrorIsNil)
7575
envConfig, err := s.IAASModel.ModelConfig()
7676
c.Assert(err, jc.ErrorIsNil)

‎cmd/juju/commands/upgradejuju_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func (s *UpgradeJujuSuite) TestUpgradeJuju(c *gc.C) {
332332
"agent-version": test.agentVersion,
333333
"agent-metadata-url": "file://" + toolsDir + "/tools",
334334
}
335-
err := s.State.UpdateModelConfig(updateAttrs, nil)
335+
err := s.IAASModel.UpdateModelConfig(updateAttrs, nil)
336336
c.Assert(err, jc.ErrorIsNil)
337337
versions := make([]version.Binary, len(test.tools))
338338
for i, v := range test.tools {
@@ -424,7 +424,7 @@ func (s *UpgradeJujuSuite) Reset(c *gc.C) {
424424
"default-series": "raring",
425425
"agent-version": "1.2.3",
426426
}
427-
err := s.State.UpdateModelConfig(updateAttrs, nil)
427+
err := s.IAASModel.UpdateModelConfig(updateAttrs, nil)
428428
c.Assert(err, jc.ErrorIsNil)
429429
s.PatchValue(&sync.BuildAgentTarball, toolstesting.GetMockBuildTools(c))
430430

@@ -629,7 +629,7 @@ func (s *UpgradeJujuSuite) setUpEnvAndTools(c *gc.C, currentVersion string, agen
629629
"agent-metadata-url": "file://" + toolsDir + "/tools",
630630
}
631631

632-
err := s.State.UpdateModelConfig(updateAttrs, nil)
632+
err := s.IAASModel.UpdateModelConfig(updateAttrs, nil)
633633
c.Assert(err, jc.ErrorIsNil)
634634
versions := make([]version.Binary, len(tools))
635635
for i, v := range tools {

‎cmd/jujud/agent/machine_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ func (s *MachineSuite) TestMachineAgentRunsAuthorisedKeysWorker(c *gc.C) {
772772

773773
// Update the keys in the environment.
774774
sshKey := sshtesting.ValidKeyOne.Key + " user@host"
775-
err := s.BackingState.UpdateModelConfig(map[string]interface{}{"authorized-keys": sshKey}, nil)
775+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"authorized-keys": sshKey}, nil)
776776
c.Assert(err, jc.ErrorIsNil)
777777

778778
// Wait for ssh keys file to be updated.
@@ -1149,7 +1149,7 @@ func (s *MachineSuite) setupIgnoreAddresses(c *gc.C, expectedIgnoreValue bool) c
11491149
})
11501150

11511151
attrs := coretesting.Attrs{"ignore-machine-addresses": expectedIgnoreValue}
1152-
err := s.BackingState.UpdateModelConfig(attrs, nil)
1152+
err := s.IAASModel.UpdateModelConfig(attrs, nil)
11531153
c.Assert(err, jc.ErrorIsNil)
11541154
return ignoreAddressCh
11551155
}

‎environs/manual/sshprovisioner/provisioner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func (s *provisionerSuite) TestProvisioningScript(c *gc.C) {
161161
machineId, err := sshprovisioner.ProvisionMachine(s.getArgs(c))
162162
c.Assert(err, jc.ErrorIsNil)
163163

164-
err = s.State.UpdateModelConfig(
164+
err = s.IAASModel.UpdateModelConfig(
165165
map[string]interface{}{
166166
"enable-os-upgrade": false,
167167
}, nil)

‎featuretests/cmd_juju_model_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (s *cmdModelSuite) TestModelUsersCmd(c *gc.C) {
109109
}
110110

111111
func (s *cmdModelSuite) TestModelConfigGet(c *gc.C) {
112-
err := s.State.UpdateModelConfig(map[string]interface{}{"special": "known"}, nil)
112+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"special": "known"}, nil)
113113
c.Assert(err, jc.ErrorIsNil)
114114

115115
context := s.run(c, "model-config", "special")
@@ -122,7 +122,7 @@ func (s *cmdModelSuite) TestModelConfigSet(c *gc.C) {
122122
}
123123

124124
func (s *cmdModelSuite) TestModelConfigReset(c *gc.C) {
125-
err := s.State.UpdateModelConfig(map[string]interface{}{"special": "known"}, nil)
125+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{"special": "known"}, nil)
126126
c.Assert(err, jc.ErrorIsNil)
127127

128128
s.run(c, "model-config", "--reset", "special")

‎featuretests/syslog_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (s *syslogSuite) SetUpTest(c *gc.C) {
137137

138138
// Leave log forwarding disabled initially, it will be enabled
139139
// via a model config update in the test.
140-
err = s.State.UpdateModelConfig(map[string]interface{}{
140+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{
141141
"syslog-host": addr,
142142
"syslog-ca-cert": coretesting.CACert,
143143
"syslog-client-cert": coretesting.ServerCert,
@@ -236,7 +236,7 @@ func (s *syslogSuite) TestLogRecordForwarded(c *gc.C) {
236236
c.Assert(a.Stop(), jc.ErrorIsNil)
237237
}()
238238

239-
err = s.State.UpdateModelConfig(map[string]interface{}{
239+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{
240240
"logforward-enabled": true,
241241
}, nil)
242242
c.Assert(err, jc.ErrorIsNil)
@@ -276,7 +276,7 @@ func (s *syslogSuite) TestConfigChange(c *gc.C) {
276276
received := make(chan rfc5424test.Message)
277277
addr := s.createSyslogServer(c, received, done)
278278

279-
err = s.State.UpdateModelConfig(map[string]interface{}{
279+
err = s.IAASModel.UpdateModelConfig(map[string]interface{}{
280280
"logforward-enabled": true,
281281
"syslog-host": addr,
282282
"syslog-ca-cert": coretesting.CACert,

‎juju/testing/conn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,6 @@ func (s *JujuConnSuite) AgentConfigForTag(c *gc.C, tag names.Tag) agent.ConfigSe
741741
// AssertConfigParameterUpdated updates environment parameter and
742742
// asserts that no errors were encountered
743743
func (s *JujuConnSuite) AssertConfigParameterUpdated(c *gc.C, key string, value interface{}) {
744-
err := s.BackingState.UpdateModelConfig(map[string]interface{}{key: value}, nil)
744+
err := s.Model.UpdateModelConfig(map[string]interface{}{key: value}, nil)
745745
c.Assert(err, jc.ErrorIsNil)
746746
}

‎juju/testing/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (s *RepoSuite) SetUpTest(c *gc.C) {
2727
s.CharmsPath = c.MkDir()
2828
// Change the environ's config to ensure we're using the one in state.
2929
updateAttrs := map[string]interface{}{"default-series": series.LatestLts()}
30-
err := s.State.UpdateModelConfig(updateAttrs, nil)
30+
err := s.Model.UpdateModelConfig(updateAttrs, nil)
3131
c.Assert(err, jc.ErrorIsNil)
3232
}
3333

‎state/allwatcher_internal_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,10 @@ func setApplicationConfigAttr(c *gc.C, app *Application, attr string, val interf
491491
}
492492

493493
func setModelConfigAttr(c *gc.C, st *State, attr string, val interface{}) {
494-
err := st.UpdateModelConfig(map[string]interface{}{attr: val}, nil)
494+
m, err := st.Model()
495+
c.Assert(err, jc.ErrorIsNil)
496+
497+
err = m.UpdateModelConfig(map[string]interface{}{attr: val}, nil)
495498
c.Assert(err, jc.ErrorIsNil)
496499
}
497500

‎state/configvalidator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (s *ConfigValidatorSuite) updateModelConfig(c *gc.C) error {
6363
"authorized-keys": "different-keys",
6464
"arbitrary-key": "shazam!",
6565
}
66-
return s.State.UpdateModelConfig(updateAttrs, nil)
66+
return s.IAASModel.UpdateModelConfig(updateAttrs, nil)
6767
}
6868

6969
func (s *ConfigValidatorSuite) TestConfigValidate(c *gc.C) {

‎state/containernetworking.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (m *Model) AutoConfigureContainerNetworking(environ environs.Environ) error
4040
} else {
4141
updateAttrs["container-networking-method"] = "local"
4242
}
43-
err = m.st.UpdateModelConfig(updateAttrs, nil)
43+
err = m.UpdateModelConfig(updateAttrs, nil)
4444
return err
4545
}
4646

‎state/containernetworking_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (s *ContainerNetworkingSuite) TestAutoConfigureContainerNetworkingAlreadyCo
5151
stub: &testing.Stub{},
5252
superSubnets: []string{"172.31.0.0/16", "192.168.1.0/24", "10.0.0.0/8"},
5353
}
54-
err := s.State.UpdateModelConfig(map[string]interface{}{
54+
err := s.IAASModel.UpdateModelConfig(map[string]interface{}{
5555
"container-networking-method": "local",
5656
"fan-config": "1.2.3.4/24=5.6.7.8/16",
5757
}, nil)

0 commit comments

Comments
 (0)