Merge lp:~themue/juju-core/050-prepare-openstack into lp:~go-bot/juju-core/trunk

[Frank Mueller]

openstack: implemented prepare of configuration

Second CL regarding the implementation of Environ.Prepare()
of the different providers.

https://codereview.appspot.com/14291043/

[Frank Mueller (themue)]

Reviewers: mp+188883_code.launchpad.net,

Message:
Please take a look.

Description:
openstack: implemented prepare of configuration

Second CL regarding the implementation of Environ.Prepare()
of the different providers.

https://code.launchpad.net/~themue/juju-core/050-prepare-openstack/+merge/188883

(do not edit description out of merge proposal)

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

Affected files (+52, -1 lines):
   A [revision details]
   M provider/openstack/config_test.go
   M provider/openstack/provider.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-20131002161148-7a4twmj22x7jxu0p
+New revision: <email address hidden>

Index: provider/openstack/config_test.go
=== modified file 'provider/openstack/config_test.go'
--- provider/openstack/config_test.go 2013-09-30 13:39:24 +0000
+++ provider/openstack/config_test.go 2013-10-02 16:25:18 +0000
@@ -507,3 +507,35 @@
    c.Assert(stripped, gc.Matches, expected)
   }
  }
+
+func (s *ConfigSuite) TestPrepare(c *gc.C) {
+ s.setupEnvCredentials()
+
+ // No value for control bucket.
+ attrs := testing.FakeConfig().Merge(testing.Attrs{
+ "type": "openstack",
+ })
+ cfg, err := config.New(config.NoDefaults, attrs)
+ c.Assert(err, gc.IsNil)
+ p, err := environs.Provider(cfg.Type())
+ c.Assert(err, gc.IsNil)
+ e, err := p.Prepare(cfg)
+ c.Assert(err, gc.IsNil)
+ ecfg := e.(*environ).ecfg()
+ c.Assert(ecfg.controlBucket(), gc.Matches, "juju-[a-f0-9]{32}")
+
+ // Wrong type of control bucket value.
+ attrs = testing.FakeConfig().Merge(testing.Attrs{
+ "type": "openstack",
+ "control-bucket": 1234,
+ })
+ cfg, err = config.New(config.NoDefaults, attrs)
+ c.Assert(err, gc.IsNil)
+ p, err = environs.Provider(cfg.Type())
+ c.Assert(err, gc.IsNil)
+ e, err = p.Prepare(cfg)
+ c.Assert(err, gc.IsNil)
+ ecfg = e.(*environ).ecfg()
+ c.Assert(ecfg.controlBucket(), gc.Matches, "juju-[a-f0-9]{32}")
+
+}

Index: provider/openstack/provider.go
=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go 2013-10-02 13:01:10 +0000
+++ provider/openstack/provider.go 2013-10-02 16:25:18 +0000
@@ -124,7 +124,24 @@
  }

  func (p environProvider) Prepare(cfg *config.Config) (environs.Environ,
error) {
- // TODO prepare environment
+ logger.Infof("preparing environment %q", cfg.Name())
+ attrs := cfg.AllAttrs()
+
+ // Check control bucket.
+ controlBucket, ok := attrs["control-bucket"].(string)
+ if !ok || controlBucket == "" {
+ uuid, err := utils.NewUUID()
+ if err != nil {
+ panic(fmt.Errorf("error generating random id: %v", err))
+ }
+ attrs["control-bucket"] = fmt.Sprintf("juju-%x", uuid.Raw())
+ }
+
+ // Apply changes.
+ cfg, err := cfg.Apply(attrs)
+ if err != nil {
+ return nil, err
+ }
   return p.Open(cfg)
  }

[William Reade (fwereade)]

same issue as https://codereview.appspot.com/14282044/ and same
suggestion -- I will try to take these over.

https://codereview.appspot.com/14291043/

[William Reade (fwereade)]

rendered moot by https://code.launchpad.net/~fwereade/juju-core/prepare-control-bucket/+merge/188955

Unmerged revisions

1929. By Frank Mueller on 2013-10-02

merged trunk

1928. By Frank Mueller on 2013-10-02

openstack: implemented prepare

=== modified file 'provider/openstack/config_test.go'
--- provider/openstack/config_test.go	2013-09-30 13:39:24 +0000
+++ provider/openstack/config_test.go	2013-10-02 16:38:29 +0000
@@ -507,3 +507,35 @@
 		c.Assert(stripped, gc.Matches, expected)
 	}
 }
+
+func (s *ConfigSuite) TestPrepare(c *gc.C) {
+	s.setupEnvCredentials()
+
+	// No value for control bucket.
+	attrs := testing.FakeConfig().Merge(testing.Attrs{
+		"type": "openstack",
+	})
+	cfg, err := config.New(config.NoDefaults, attrs)
+	c.Assert(err, gc.IsNil)
+	p, err := environs.Provider(cfg.Type())
+	c.Assert(err, gc.IsNil)
+	e, err := p.Prepare(cfg)
+	c.Assert(err, gc.IsNil)
+	ecfg := e.(*environ).ecfg()
+	c.Assert(ecfg.controlBucket(), gc.Matches, "juju-[a-f0-9]{32}")
+
+	// Wrong type of control bucket value.
+	attrs = testing.FakeConfig().Merge(testing.Attrs{
+		"type":           "openstack",
+		"control-bucket": 1234,
+	})
+	cfg, err = config.New(config.NoDefaults, attrs)
+	c.Assert(err, gc.IsNil)
+	p, err = environs.Provider(cfg.Type())
+	c.Assert(err, gc.IsNil)
+	e, err = p.Prepare(cfg)
+	c.Assert(err, gc.IsNil)
+	ecfg = e.(*environ).ecfg()
+	c.Assert(ecfg.controlBucket(), gc.Matches, "juju-[a-f0-9]{32}")
+
+}

=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2013-10-02 13:01:10 +0000
+++ provider/openstack/provider.go	2013-10-02 16:38:29 +0000
@@ -124,7 +124,24 @@
 }
 
 func (p environProvider) Prepare(cfg *config.Config) (environs.Environ, error) {
-	// TODO prepare environment
+	logger.Infof("preparing environment %q", cfg.Name())
+	attrs := cfg.AllAttrs()
+
+	// Check control bucket.
+	controlBucket, ok := attrs["control-bucket"].(string)
+	if !ok || controlBucket == "" {
+		uuid, err := utils.NewUUID()
+		if err != nil {
+			panic(fmt.Errorf("error generating random id: %v", err))
+		}
+		attrs["control-bucket"] = fmt.Sprintf("juju-%x", uuid.Raw())
+	}
+
+	// Apply changes.
+	cfg, err := cfg.Apply(attrs)
+	if err != nil {
+		return nil, err
+	}
 	return p.Open(cfg)
 }