Introduce the null provider

provider/null/config_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package null
 
 import (
         "fmt"
         "regexp"
         stdtesting "testing"
 
@@ skipping 12 matching lines @@
 var _ = gc.Suite(&configSuite{})
 
 func Test(t *stdtesting.T) {
         gc.TestingT(t)
 }
 
 func minimalConfigValues() map[string]interface{} {
         return map[string]interface{}{
                 "name":           "test",
                 "type":           provider.Null,
                 "bootstrap-host": "hostname",

[fwereade, 2013/09/23 16:32:25]

Don't we need several of the others?

[axw1, 2013/09/24 03:05:57]

This is the minimal set. Everything else has defaults. Here's my real, working
environments.yaml:

"null":
  type: "null"
  admin-secret: b3661e7a8949b955bc447d4123417943
  default-series: raring
  bootstrap-host: wimpy

                 // While the ca-cert bits aren't entirely minimal, they avoid the need
                 // to set up a fake home.
                 "ca-cert":        coretesting.CACert,
                 "ca-private-key": coretesting.CAKey,
         }
 }
 
 func minimalConfig(c *gc.C) *config.Config {
         minimal := minimalConfigValues()
         testConfig, err := config.New(config.UseDefaults, minimal)
@@ skipping 16 matching lines @@
         _, err = nullProvider{}.Validate(testConfig, nil)
         c.Assert(err, gc.ErrorMatches, "bootstrap-host must be specified")
 
         testConfig = minimalConfig(c)
         valid, err := nullProvider{}.Validate(testConfig, nil)
         c.Assert(err, gc.IsNil)
 
         unknownAttrs := valid.UnknownAttrs()
         c.Assert(unknownAttrs["bootstrap-host"], gc.Equals, "hostname")
         c.Assert(unknownAttrs["bootstrap-user"], gc.Equals, "")
-        c.Assert(unknownAttrs["storage-ip"], gc.Equals, "")
+        c.Assert(unknownAttrs["storage-listen-ip"], gc.Equals, "")
         c.Assert(unknownAttrs["storage-port"], gc.Equals, int64(8040))
-        c.Assert(unknownAttrs["storage-dir"], gc.Equals, "/var/lib/juju/storage")
+}
+
+func (s *configSuite) TestConfigMutability(c *gc.C) {
+        testConfig := minimalConfig(c)
+        valid, err := nullProvider{}.Validate(testConfig, nil)
+        c.Assert(err, gc.IsNil)
+        unknownAttrs := valid.UnknownAttrs()
 

[fwereade, 2013/09/23 16:32:25]

separate test here?

[axw1, 2013/09/24 03:05:57]

Done.

         // Make sure the immutable values can't be changed. It'd be nice to be
         // able to change these, but that would involve somehow updating the
         // machine agent's config/upstart config.
         oldConfig := testConfig
         for k, v := range map[string]interface{}{
-                "bootstrap-host": "new-hostname",
-                "bootstrap-user": "new-username",
-                "storage-ip":     "10.0.0.123",
-                "storage-dir":    "/new/storage/dir",
-                "storage-port":   int64(1234),
+                "bootstrap-host":    "new-hostname",
+                "bootstrap-user":    "new-username",
+                "storage-listen-ip": "10.0.0.123",
+                "storage-port":      int64(1234),
         } {
                 testConfig = minimalConfig(c)
                 testConfig, err = testConfig.Apply(map[string]interface{}{k: v})
                 c.Assert(err, gc.IsNil)
                 _, err := nullProvider{}.Validate(testConfig, oldConfig)
                 oldv := unknownAttrs[k]
                 errmsg := fmt.Sprintf("cannot change %s from %q to %q", k, oldv, v)
                 c.Assert(err, gc.ErrorMatches, regexp.QuoteMeta(errmsg))
         }
 }
@@ skipping 10 matching lines @@
         c.Assert(testConfig.bootstrapHost(), gc.Equals, "127.0.0.1")
         c.Assert(testConfig.bootstrapUser(), gc.Equals, "ubuntu")
         c.Assert(testConfig.sshHost(), gc.Equals, "ubuntu@127.0.0.1")
 }
 
 func (s *configSuite) TestStorageParams(c *gc.C) {
         values := minimalConfigValues()
         testConfig := getEnvironConfig(c, values)
         c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:8040")
         c.Assert(testConfig.storageListenAddr(), gc.Equals, ":8040")
-        values["storage-ip"] = "10.0.0.123"
+        values["storage-listen-ip"] = "10.0.0.123"
         values["storage-port"] = int64(1234)
-        values["storage-dir"] = "/some/where"
         testConfig = getEnvironConfig(c, values)
         c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:1234")
         c.Assert(testConfig.storageListenAddr(), gc.Equals, "10.0.0.123:1234")
 }