Merge lp:~niemeyer/pyjuju/go-state-environconfig into lp:pyjuju/go

[Gustavo Niemeyer]

state: rename Environment method to EnvironConfig

https://codereview.appspot.com/6295048/

[Gustavo Niemeyer (niemeyer)]

Reviewers: mp+108935_code.launchpad.net,

Message:
Please take a look.

Description:
state: rename Environment method to EnvironConfig

https://code.launchpad.net/~niemeyer/juju/go-state-environconfig/+merge/108935

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/jujud/provisioning_test.go
   M state/state.go
   M state/state_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: <email address hidden>
+New revision: <email address hidden>

Index: state/state.go
=== modified file 'state/state.go'
--- state/state.go 2012-06-05 21:31:50 +0000
+++ state/state.go 2012-06-06 12:42:15 +0000
@@ -74,8 +74,8 @@
   return newConfigWatcher(s, zkEnvironmentPath)
  }

-// Environment returns the current configuration of the environment.
-func (s *State) Environment() (*ConfigNode, error) {
+// EnvironConfig returns the current configuration of the environment.
+func (s *State) EnvironConfig() (*ConfigNode, error) {
   return readConfigNode(s.zk, zkEnvironmentPath)
  }

Index: state/state_test.go
=== modified file 'state/state_test.go'
--- state/state_test.go 2012-06-06 10:17:40 +0000
+++ state/state_test.go 2012-06-06 12:42:15 +0000
@@ -1159,12 +1159,12 @@
   c.Assert(err, ErrorMatches, `can't add relations between 3 services`)
  }

-func (s *StateSuite) TestEnvironment(c *C) {
+func (s *StateSuite) TestEnvironConfig(c *C) {
   path, err := s.zkConn.Create("/environment", "type: dummy\nname: foo\n",
0, zookeeper.WorldACL(zookeeper.PERM_ALL))
   c.Assert(err, IsNil)
   c.Assert(path, Equals, "/environment")

- env, err := s.st.Environment()
+ env, err := s.st.EnvironConfig()
   env.Read()
   c.Assert(err, IsNil)
   c.Assert(env.Map(), DeepEquals,
map[string]interface{}{"type": "dummy", "name": "foo"})

Index: cmd/jujud/provisioning_test.go
=== modified file 'cmd/jujud/provisioning_test.go'
--- cmd/jujud/provisioning_test.go 2012-06-05 07:57:23 +0000
+++ cmd/jujud/provisioning_test.go 2012-06-06 12:42:15 +0000
@@ -67,8 +67,8 @@
  func (s *ProvisioningSuite) TestProvisionerEnvironmentChange(c *C) {
   p := NewProvisioner(s.st)

- // seed /environment to point to dummy
- env, err := s.st.Environment()
+ // Change environment configuration to point to dummy.
+ env, err := s.st.EnvironConfig()
   c.Assert(err, IsNil)
   env.Set("type", "dummy")
   env.Set("zookeeper", false)
@@ -76,8 +76,8 @@
   _, err = env.Write()
   c.Assert(err, IsNil)

- // twiddle with the environment
- env, err = s.st.Environment()
+ // Twiddle with the environment configuration.
+ env, err = s.st.EnvironConfig()
   c.Assert(err, IsNil)
   env.Set("name", "testing2")
   _, err = env.Write()
@@ -90,8 +90,8 @@
  func (s *ProvisioningSuite) TestProvisionerStopOnStateClose(c *C) {
   p := NewProvisioner(s.st)

- // seed /environment to point to dummy
- env, err := s.st.Environment()
+ // Change environment configuration to point to dummy.
+ env, err := s.st.EnvironConfig...

[Dave Cheney (dave-cheney)]

LGTM.

On 06/06/2012, at 23:13, Gustavo Niemeyer <email address hidden> wrote:

> Reviewers: mp+108935_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> state: rename Environment method to EnvironConfig
>
>
>
> https://code.launchpad.net/~niemeyer/juju/go-state-environconfig/+merge/108935
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/6295048/
>
> Affected files:
> A [revision details]
> M cmd/jujud/provisioning_test.go
> M state/state.go
> M state/state_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: <email address hidden>
> +New revision: <email address hidden>
>
> Index: state/state.go
> === modified file 'state/state.go'
> --- state/state.go 2012-06-05 21:31:50 +0000
> +++ state/state.go 2012-06-06 12:42:15 +0000
> @@ -74,8 +74,8 @@
> return newConfigWatcher(s, zkEnvironmentPath)
> }
>
> -// Environment returns the current configuration of the environment.
> -func (s *State) Environment() (*ConfigNode, error) {
> +// EnvironConfig returns the current configuration of the environment.
> +func (s *State) EnvironConfig() (*ConfigNode, error) {
> return readConfigNode(s.zk, zkEnvironmentPath)
> }
>
>
>
> Index: state/state_test.go
> === modified file 'state/state_test.go'
> --- state/state_test.go 2012-06-06 10:17:40 +0000
> +++ state/state_test.go 2012-06-06 12:42:15 +0000
> @@ -1159,12 +1159,12 @@
> c.Assert(err, ErrorMatches, `can't add relations between 3 services`)
> }
>
> -func (s *StateSuite) TestEnvironment(c *C) {
> +func (s *StateSuite) TestEnvironConfig(c *C) {
> path, err := s.zkConn.Create("/environment", "type: dummy\nname: foo\n",
> 0, zookeeper.WorldACL(zookeeper.PERM_ALL))
> c.Assert(err, IsNil)
> c.Assert(path, Equals, "/environment")
>
> - env, err := s.st.Environment()
> + env, err := s.st.EnvironConfig()
> env.Read()
> c.Assert(err, IsNil)
> c.Assert(env.Map(), DeepEquals,
> map[string]interface{}{"type": "dummy", "name": "foo"})
>
>
> Index: cmd/jujud/provisioning_test.go
> === modified file 'cmd/jujud/provisioning_test.go'
> --- cmd/jujud/provisioning_test.go 2012-06-05 07:57:23 +0000
> +++ cmd/jujud/provisioning_test.go 2012-06-06 12:42:15 +0000
> @@ -67,8 +67,8 @@
> func (s *ProvisioningSuite) TestProvisionerEnvironmentChange(c *C) {
> p := NewProvisioner(s.st)
>
> - // seed /environment to point to dummy
> - env, err := s.st.Environment()
> + // Change environment configuration to point to dummy.
> + env, err := s.st.EnvironConfig()
> c.Assert(err, IsNil)
> env.Set("type", "dummy")
> env.Set("zookeeper", false)
> @@ -76,8 +76,8 @@
> _, err = env.Write()
> c.Assert(err, IsNil)
>
> - // twiddle with the environment
> - env, err = s.st.Environment()
> + // Twiddle with the environment configuration.
> + env, err = s.st.EnvironConfig()
> c.Asse...

[lp:~niemeyer/pyjuju/go-state-environconfig]

207. By Frank Mueller on 2012-06-06

state: Added the method RemoveRelation() to State.

Relation is now an interface defining the single
method relationKey() to allow a function signature
like today in Python. The implementation is now
named relation and can be accessed via type
assertion.

R=niemeyer
CC=
https://codereview.appspot.com/6250076

208. By William Reade on 2012-06-06

subordinate service units can now be added to principal service units

This entails the following changes:

* new Service.AddUnitSubordinateTo method, which requires a principal unit
* topology.AddUnit now takes an additional principalKey string argument,
  which will be empty for a principal unit;
* new topology.UnitPrincipalKey, which returns the principal unit key for a
  subordinate unit or an error for a principal unit;
* new Unit.IsPrincipal method, which returns whether the unit is a principal
  unit;
* checks to prevent subordinate units being assigned directly to machines.

Most of the diff lines are a result of the change to topology.AddUnit;
sorry for the noise.

R=TheMue, niemeyer
CC=
https://codereview.appspot.com/6268050

[William Reade (fwereade)]

LGTM

https://codereview.appspot.com/6295048/

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

state: rename Environment method to EnvironConfig

R=TheMue, fwereade
CC=
https://codereview.appspot.com/6295048

https://codereview.appspot.com/6295048/

[lp:~niemeyer/pyjuju/go-state-environconfig]

209. By Gustavo Niemeyer on 2012-06-06

state: rename Environment method to EnvironConfig

R=TheMue, fwereade
CC=
https://codereview.appspot.com/6295048

=== modified file 'cmd/jujud/provisioning_test.go'
--- cmd/jujud/provisioning_test.go	2012-06-05 07:57:23 +0000
+++ cmd/jujud/provisioning_test.go	2012-06-06 13:10:09 +0000
@@ -67,8 +67,8 @@
 func (s *ProvisioningSuite) TestProvisionerEnvironmentChange(c *C) {
 	p := NewProvisioner(s.st)
 
-	// seed /environment to point to dummy
-	env, err := s.st.Environment()
+	// Change environment configuration to point to dummy.
+	env, err := s.st.EnvironConfig()
 	c.Assert(err, IsNil)
 	env.Set("type", "dummy")
 	env.Set("zookeeper", false)
@@ -76,8 +76,8 @@
 	_, err = env.Write()
 	c.Assert(err, IsNil)
 
-	// twiddle with the environment
-	env, err = s.st.Environment()
+	// Twiddle with the environment configuration.
+	env, err = s.st.EnvironConfig()
 	c.Assert(err, IsNil)
 	env.Set("name", "testing2")
 	_, err = env.Write()
@@ -90,8 +90,8 @@
 func (s *ProvisioningSuite) TestProvisionerStopOnStateClose(c *C) {
 	p := NewProvisioner(s.st)
 
-	// seed /environment to point to dummy
-	env, err := s.st.Environment()
+	// Change environment configuration to point to dummy.
+	env, err := s.st.EnvironConfig()
 	c.Assert(err, IsNil)
 	env.Set("type", "dummy")
 	env.Set("zookeeper", false)

=== modified file 'state/state.go'
--- state/state.go	2012-06-05 21:31:50 +0000
+++ state/state.go	2012-06-06 13:10:09 +0000
@@ -74,8 +74,8 @@
 	return newConfigWatcher(s, zkEnvironmentPath)
 }
 
-// Environment returns the current configuration of the environment.
-func (s *State) Environment() (*ConfigNode, error) {
+// EnvironConfig returns the current configuration of the environment.
+func (s *State) EnvironConfig() (*ConfigNode, error) {
 	return readConfigNode(s.zk, zkEnvironmentPath)
 }
 

=== modified file 'state/state_test.go'
--- state/state_test.go	2012-06-06 10:17:40 +0000
+++ state/state_test.go	2012-06-06 13:10:09 +0000
@@ -1159,12 +1159,12 @@
 	c.Assert(err, ErrorMatches, `can't add relations between 3 services`)
 }
 
-func (s *StateSuite) TestEnvironment(c *C) {
+func (s *StateSuite) TestEnvironConfig(c *C) {
 	path, err := s.zkConn.Create("/environment", "type: dummy\nname: foo\n", 0, zookeeper.WorldACL(zookeeper.PERM_ALL))
 	c.Assert(err, IsNil)
 	c.Assert(path, Equals, "/environment")
 
-	env, err := s.st.Environment()
+	env, err := s.st.EnvironConfig()
 	env.Read()
 	c.Assert(err, IsNil)
 	c.Assert(env.Map(), DeepEquals, map[string]interface{}{"type": "dummy", "name": "foo"})