Reviewers: mp+214866_code.launchpad.net,

Message:
Please take a look.

Description:
Force manual storage-port to int

The manual provider storage-port config
attribute needs to have a schema definition
of ForceInt so it can be deserialised from
state correctly.

https://code.launchpad.net/~wallyworld/juju-core/manual-provider-storage-port-type/+merge/214866

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/85750045/

Affected files (+20, -5 lines):
   A [revision details]
   M provider/manual/config.go
   M provider/manual/config_test.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140408170048-h58307lijtftb3su
+New revision: <email address hidden>

Index: provider/manual/config.go
=== modified file 'provider/manual/config.go'
--- provider/manual/config.go	2014-02-10 11:35:13 +0000
+++ provider/manual/config.go	2014-04-09 01:12:03 +0000
@@ -17,7 +17,7 @@
  		"bootstrap-host":    schema.String(),
  		"bootstrap-user":    schema.String(),
  		"storage-listen-ip": schema.String(),
-		"storage-port":      schema.Int(),
+		"storage-port":      schema.ForceInt(),
  		"storage-auth-key":  schema.String(),
  		"use-sshstorage":    schema.Bool(),
  	}
@@ -59,7 +59,7 @@
  }

  func (c *environConfig) storagePort() int {
-	return int(c.attrs["storage-port"].(int64))
+	return c.attrs["storage-port"].(int)
  }

  func (c *environConfig) storageAuthKey() string {


Index: provider/manual/config_test.go
=== modified file 'provider/manual/config_test.go'
--- provider/manual/config_test.go	2014-03-13 07:54:56 +0000
+++ provider/manual/config_test.go	2014-04-09 01:12:03 +0000
@@ -72,7 +72,7 @@
  	c.Assert(unknownAttrs["bootstrap-host"], gc.Equals, "hostname")
  	c.Assert(unknownAttrs["bootstrap-user"], gc.Equals, "")
  	c.Assert(unknownAttrs["storage-listen-ip"], gc.Equals, "")
-	c.Assert(unknownAttrs["storage-port"], gc.Equals, int64(8040))
+	c.Assert(unknownAttrs["storage-port"], gc.Equals, int(8040))
  }

  func (s *configSuite) TestConfigMutability(c *gc.C) {
@@ -89,7 +89,7 @@
  		"bootstrap-host":    "new-hostname",
  		"bootstrap-user":    "new-username",
  		"storage-listen-ip": "10.0.0.123",
-		"storage-port":      int64(1234),
+		"storage-port":      1234,
  	} {
  		testConfig = MinimalConfig(c)
  		testConfig, err = testConfig.Apply(map[string]interface{}{k: v})
@@ -119,7 +119,7 @@
  	c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:8040")
  	c.Assert(testConfig.storageListenAddr(), gc.Equals, ":8040")
  	values["storage-listen-ip"] = "10.0.0.123"
-	values["storage-port"] = int64(1234)
+	values["storage-port"] = 1234
  	testConfig = getEnvironConfig(c, values)
  	c.Assert(testConfig.storageAddr(), gc.Equals, "hostname:1234")
  	c.Assert(testConfig.storageListenAddr(), gc.Equals, "10.0.0.123:1234")
@@ -137,3 +137,16 @@
  	c.Assert(err, gc.IsNil)
  	c.Assert(envConfig.useSSHStorage(), jc.IsFalse)
  }
+
+func (s *configSuite) TestValidateConfigWithFloatPort(c *gc.C) {
+	// When the config values get serialized through JSON, the integers
+	// get coerced to float64 values.  The parsing needs to handle this.
+	values := MinimalConfigValues()
+	values["storage-port"] = float64(8040)
+	cfg, err := config.New(config.UseDefaults, values)
+	c.Assert(err, gc.IsNil)
+	valid, err := ProviderInstance.Validate(cfg, nil)
+	c.Assert(err, gc.IsNil)
+	unknownAttrs := valid.UnknownAttrs()
+	c.Assert(unknownAttrs["storage-port"], gc.Equals, int(8040))
+}